diff options
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | src/.gitignore | 3 | ||||
-rw-r--r-- | src/CMakeLists.txt | 14 |
3 files changed, 11 insertions, 9 deletions
@@ -20,5 +20,8 @@ /CMakeCache.txt /CMakeFiles /cmake_install.cmake +/*-config.cmake +/*-config-version.cmake +/*-targets.cmake /install_manifest.txt /*.user diff --git a/src/.gitignore b/src/.gitignore index bc4c60ae..c633440c 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -27,9 +27,6 @@ /CMakeFiles /cmake_install.cmake -/*-config.cmake -/*-config-version.cmake -/*-targets.cmake /*.exe # Common testing files. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dfbef1c4..b961f9af 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,7 +25,8 @@ set(common_COMPILE_DEFINITIONS PREFIX="${CMAKE_INSTALL_PREFIX}") configure_file(version.h.cmake.in version.h @ONLY) configure_file(config.h.cmake.in config.h @ONLY) configure_file(defs.h.cmake.in defs.h @ONLY) -configure_file(colm-config.cmake.in ${_PACKAGE_NAME}-config.cmake @ONLY) +configure_file(colm-config.cmake.in + "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config.cmake" @ONLY) # Runtime headers set(RUNTIME_HDR @@ -160,14 +161,15 @@ if(${PROJECT_NAME}_MAKE_INSTALL) NAMESPACE ${_PACKAGE_NAME}:: DESTINATION "${CMAKE_INSTALL_CMAKEDIR}") export(EXPORT ${_PACKAGE_NAME}-targets - NAMESPACE ${_PACKAGE_NAME}::) + NAMESPACE ${_PACKAGE_NAME}:: + FILE "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-targets.cmake") include(CMakePackageConfigHelpers) write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/${_PACKAGE_NAME}-config-version.cmake" - VERSION ${${PROJECT_NAME}_VERSION} + "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config-version.cmake" + VERSION ${PROJECT_VERSION} COMPATIBILITY AnyNewerVersion) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${_PACKAGE_NAME}-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/${_PACKAGE_NAME}-config-version.cmake" + "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config.cmake" + "${PROJECT_BINARY_DIR}/${_PACKAGE_NAME}-config-version.cmake" DESTINATION "${CMAKE_INSTALL_CMAKEDIR}") endif() |