From da30315018b5d03ded5b1491a67898b1de98e33b Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Thu, 4 Oct 2018 17:27:36 +0200
Subject: [PATCH] Revert "project-template: use GNUInstallDirs to determin
install destionations"
This reverts commit 7eace484c0ffcc9c9041a58190bd9f7a184b1321.
GNUInstallDirs doesn't really deliver the intended directories. CMAKE_INSTALL_LIBDIR e.g. points to lib/x86_64-linux-gnu on Ubuntu 16.04
---
cmake/create_cmake_config_files.cmake | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/cmake/create_cmake_config_files.cmake b/cmake/create_cmake_config_files.cmake
index 6ec184f..af2c07d 100644
--- a/cmake/create_cmake_config_files.cmake
+++ b/cmake/create_cmake_config_files.cmake
@@ -27,8 +27,6 @@
#
#######################################################################################################################
-include(GNUInstallDirs)
-
# create variables for standard makefiles
set(${PROJECT_NAME}_CXX_FLAGS_MAKEFILE "${${PROJECT_NAME}_CXX_FLAGS}")
@@ -67,14 +65,14 @@ configure_file(${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}-config.in "${PROJECT_
# install cmake find_package configuration file
install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} COMPONENT dev)
+ DESTINATION lib/cmake/${PROJECT_NAME} COMPONENT dev)
install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} COMPONENT dev)
+ DESTINATION lib/cmake/${PROJECT_NAME} COMPONENT dev)
# install same cmake configuration file another time into the Modules cmake subdirectory for compatibility reasons
install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules RENAME Find${PROJECT_NAME}.cmake COMPONENT dev)
+ DESTINATION share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules RENAME Find${PROJECT_NAME}.cmake COMPONENT dev)
# install script for Makefiles
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT dev)
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config DESTINATION bin COMPONENT dev)
--
GitLab