From 6ca93394f4d9913e8324910c5a1353e5b9adf7a6 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Thu, 24 Dec 2020 10:04:27 +0100 Subject: [PATCH] fix #97: install cmake files in ${libdir} --- src/libhashkit/CMakeLists.txt | 2 +- src/libmemcached/CMakeLists.txt | 2 +- src/libmemcachedprotocol/CMakeLists.txt | 2 +- src/libmemcachedutil/CMakeLists.txt | 2 +- support/CMakeLists.txt | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt index 81129ef7..48a9a1b9 100644 --- a/src/libhashkit/CMakeLists.txt +++ b/src/libhashkit/CMakeLists.txt @@ -49,7 +49,7 @@ install(TARGETS libhashkit EXPORT libhashkit-targets export(EXPORT libhashkit-targets NAMESPACE libmemcached::) install(EXPORT libhashkit-targets NAMESPACE libmemcached:: COMPONENT dev - DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) install_public_headers( libhashkit diff --git a/src/libmemcached/CMakeLists.txt b/src/libmemcached/CMakeLists.txt index ebc5a213..ffa1c0ad 100644 --- a/src/libmemcached/CMakeLists.txt +++ b/src/libmemcached/CMakeLists.txt @@ -129,7 +129,7 @@ install(TARGETS libmemcached EXPORT libmemcached-targets export(EXPORT libmemcached-targets NAMESPACE libmemcached::) install(EXPORT libmemcached-targets NAMESPACE libmemcached:: COMPONENT dev - DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) install_public_headers( libmemcached diff --git a/src/libmemcachedprotocol/CMakeLists.txt b/src/libmemcachedprotocol/CMakeLists.txt index 3e69aad9..91bfe36c 100644 --- a/src/libmemcachedprotocol/CMakeLists.txt +++ b/src/libmemcachedprotocol/CMakeLists.txt @@ -45,4 +45,4 @@ install(TARGETS libmemcachedprotocol EXPORT libmemcachedprotocol-targets export(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached::) install(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached:: COMPONENT dev - DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) diff --git a/src/libmemcachedutil/CMakeLists.txt b/src/libmemcachedutil/CMakeLists.txt index 88f1e8df..d99b065e 100644 --- a/src/libmemcachedutil/CMakeLists.txt +++ b/src/libmemcachedutil/CMakeLists.txt @@ -48,4 +48,4 @@ install(TARGETS libmemcachedutil EXPORT libmemcachedutil-targets export(EXPORT libmemcachedutil-targets NAMESPACE libmemcached::) install(EXPORT libmemcachedutil-targets NAMESPACE libmemcached:: COMPONENT dev - DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index a2955623..306168af 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -27,7 +27,7 @@ endif() configure_package_config_file(libmemcached-config.cmake.in libmemcached-config.cmake - INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake/) + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) write_basic_package_version_file(libhashkit-version.cmake VERSION ${LIBHASHKIT_VERSION} COMPATIBILITY SameMajorVersion) @@ -47,4 +47,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmemcachedprotocol-version.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmemcachedutil-version.cmake COMPONENT dev - DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake/) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/) -- 2.30.2