From a1b3eed61d47c195e3d1bccb2e564d31fe41e37a Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Sun, 7 Jun 2020 13:50:17 +0200
Subject: [PATCH] cmake: use GNUInstallDirs (#187)
---
CMake/Modules/Install.cmake | 14 ++++++--------
CMake/templates/CMakeLists_bin.txt | 2 +-
CMake/templates/CMakeLists_lib.txt | 4 ++--
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/CMake/Modules/Install.cmake b/CMake/Modules/Install.cmake
index 81d03bcfa8..cc5daf290c 100644
--- a/CMake/Modules/Install.cmake
+++ b/CMake/Modules/Install.cmake
@@ -1,16 +1,14 @@
# install paths
# -------------
+include(GNUInstallDirs)
+
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set (CMAKE_INSTALL_PREFIX /usr)
endif()
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-if(NOT LIBRARY_INSTALL_DIRECTORY)
- set(LIBRARY_INSTALL_DIRECTORY "lib")
-endif()
-
message ( "[Install] Install directory prefix is: ${CMAKE_INSTALL_PREFIX}" )
-message ( "[Install] Library install directory is: ${CMAKE_INSTALL_PREFIX}/${LIBRARY_INSTALL_DIRECTORY}" )
+message ( "[Install] Full install paths: ${CMAKE_INSTALL_FULL_BINDIR}, ${CMAKE_INSTALL_FULL_LIBDIR}, ${CMAKE_INSTALL_FULL_INCLUDEDIR}" )
+
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/CMake/templates/CMakeLists_bin.txt b/CMake/templates/CMakeLists_bin.txt
index b243c2bcb8..b43ffc1d44 100644
--- a/CMake/templates/CMakeLists_bin.txt
+++ b/CMake/templates/CMakeLists_bin.txt
@@ -23,4 +23,4 @@ target_include_directories(${{PROJECT_NAME}}
target_link_libraries(${{PROJECT_NAME}} {target_libs})
# Install
-install(TARGETS ${{PROJECT_NAME}} RUNTIME DESTINATION bin)
+install(TARGETS ${{PROJECT_NAME}} RUNTIME DESTINATION ${{CMAKE_INSTALL_BINDIR}})
diff --git a/CMake/templates/CMakeLists_lib.txt b/CMake/templates/CMakeLists_lib.txt
index dbd1e35db3..cbc86b7992 100644
--- a/CMake/templates/CMakeLists_lib.txt
+++ b/CMake/templates/CMakeLists_lib.txt
@@ -30,12 +30,12 @@ set_target_properties(${{PROJECT_NAME}} PROPERTIES
)
# Install
-install(TARGETS ${{PROJECT_NAME}} LIBRARY DESTINATION ${{LIBRARY_INSTALL_DIRECTORY}})
+install(TARGETS ${{PROJECT_NAME}} LIBRARY DESTINATION ${{CMAKE_INSTALL_LIBDIR}})
FOREACH(HEADER {include_files})
get_filename_component(DIR ${{HEADER}} DIRECTORY)
STRING(REGEX REPLACE "^src" "" DIR ${{DIR}})
- INSTALL(FILES ${{HEADER}} DESTINATION include/algorithms-library/${{DIR}})
+ INSTALL(FILES ${{HEADER}} DESTINATION ${{CMAKE_INSTALL_INCLUDEDIR}}/algorithms-library/${{DIR}})
ENDFOREACH(HEADER)
########################################################################################################################
--
GitLab