From bd01a5f2d26b936e841c91ccab944ed4ea4d17dc Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Mon, 16 Mar 2020 19:36:18 +0100 Subject: [PATCH] cmake pkg --- CMakeLists.txt | 4 +--- cmake/package_config.cmake | 9 ++++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88dab1189..31d67ae1e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,11 +203,9 @@ if(SLS_BUILD_DOCS) add_subdirectory(docs) endif(SLS_BUILD_DOCS) - - if(SLS_MASTER_PROJECT) # Set install dir CMake packages - set(CMAKE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/cmake/sls) + set(CMAKE_INSTALL_DIR "share/cmake/${PROJECT_NAME}") # Set the list of exported targets set(PROJECT_LIBRARIES slsSupportLib slsDetectorShared slsReceiverShared) # Generate and install package config file and version diff --git a/cmake/package_config.cmake b/cmake/package_config.cmake index 9411a0a03..bfa0a31a8 100755 --- a/cmake/package_config.cmake +++ b/cmake/package_config.cmake @@ -15,17 +15,20 @@ configure_package_config_file( write_basic_package_version_file( "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" VERSION ${PROJECT_VERSION} - COMPATIBILITY SameMajorVersion) + COMPATIBILITY SameMajorVersion +) install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config.cmake" "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" COMPONENT devel - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER}) + DESTINATION ${CMAKE_INSTALL_DIR} +) if (PROJECT_LIBRARIES OR PROJECT_STATIC_LIBRARIES) install( EXPORT "${TARGETS_EXPORT_NAME}" FILE ${PROJECT_NAME_LOWER}-targets.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER}) + DESTINATION ${CMAKE_INSTALL_DIR} + ) endif ()