diff --git a/cmake/modules/BasicConfig.cmake b/cmake/modules/BasicConfig.cmake index 250a487..b0f0a85 100644 --- a/cmake/modules/BasicConfig.cmake +++ b/cmake/modules/BasicConfig.cmake @@ -193,16 +193,9 @@ set(TARGET_EXECUTABLE "${CMAKE_INSTALL_FULL_BINDIR}/${META_TARGET_NAME}") if (META_FEATURES_FOR_COMPILER_DETECTION_HEADER) include(WriteCompilerDetectionHeader) write_compiler_detection_header( - FILE - "${CMAKE_CURRENT_BINARY_DIR}/resources/features.h" - PREFIX - "${META_PROJECT_VARNAME_UPPER}" - COMPILERS - GNU - Clang - AppleClang - FEATURES - ${META_FEATURES_FOR_COMPILER_DETECTION_HEADER}) + FILE "${CMAKE_CURRENT_BINARY_DIR}/resources/features.h" PREFIX "${META_PROJECT_VARNAME_UPPER}" + COMPILERS GNU Clang AppleClang + FEATURES ${META_FEATURES_FOR_COMPILER_DETECTION_HEADER}) endif () # disable new ABI (can't catch ios_base::failure with new ABI) diff --git a/cmake/modules/LibraryTarget.cmake b/cmake/modules/LibraryTarget.cmake index edfe4f2..a254488 100644 --- a/cmake/modules/LibraryTarget.cmake +++ b/cmake/modules/LibraryTarget.cmake @@ -234,16 +234,10 @@ endif () find_template_file("Config.cmake" CPP_UTILITIES CONFIG_TEMPLATE_FILE) foreach (CONFIG_TARGET ${CONFIG_TARGETS}) configure_package_config_file( - "${CONFIG_TEMPLATE_FILE}" - "${CONFIG_TARGET}" - INSTALL_DESTINATION - "${CMAKE_CONFIG_INSTALL_DESTINATION}" - PATH_VARS - CMAKE_MODULE_INSTALL_DESTINATION - CMAKE_CONFIG_INSTALL_DESTINATION - HEADER_INSTALL_DESTINATION - BIN_INSTALL_DESTINATION - LIB_INSTALL_DESTINATION) + "${CONFIG_TEMPLATE_FILE}" "${CONFIG_TARGET}" + INSTALL_DESTINATION "${CMAKE_CONFIG_INSTALL_DESTINATION}" + PATH_VARS CMAKE_MODULE_INSTALL_DESTINATION CMAKE_CONFIG_INSTALL_DESTINATION HEADER_INSTALL_DESTINATION + BIN_INSTALL_DESTINATION LIB_INSTALL_DESTINATION) endforeach () list(APPEND CMAKE_CONFIG_FILES "${CMAKE_CURRENT_BINARY_DIR}/${META_PROJECT_NAME}${META_CONFIG_SUFFIX}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${META_PROJECT_NAME}${META_CONFIG_SUFFIX}ConfigVersion.cmake")