Remove requirement to specify COMMON_UNIVERSAL_CMAKE_DIR