Start using GNUInstallDirs in every CMake install()

Signed-off-by: Mikko Johannes Koivunalho <mikko.koivunalho@iki.fi>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0edfd0068d00274658ed53e20fb555799f108493..4694661619b71b6c51c2658b49ef2e3e11a9f877 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,10 @@ set(MEMORY_LEAKING_TESTS_ENABLED 1)
 # Set build features
 set(CMAKE_BUILD_TYPE Debug)
 
+###############################################################################
+# Provides install directory variables as defined by the GNU Coding Standards.
+include(GNUInstallDirs)
+
 ###############################################################################
 # Adhere strictly to old ANSI C89 / ISO C90 standard
 set(CMAKE_C_STANDARD 90)
@@ -379,7 +383,10 @@ set(CONFIG_HEADER ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 set(PROJECT_VERSION "${check_VERSION}")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/check_stdint.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/check_stdint.h @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/check_stdint.h DESTINATION include)
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/check_stdint.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
 
 ###############################################################################
 # Generate "check.pc", the package config (pkgconfig) file for libtool
@@ -428,7 +435,7 @@ set(PREFIX "${prefix_save}")
 
 install(
   FILES ${CMAKE_CURRENT_BINARY_DIR}/check.pc
-  DESTINATION lib/pkgconfig
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 
 ###############################################################################
@@ -494,12 +501,12 @@ export(EXPORT check-targets
 install(EXPORT check-targets
   NAMESPACE Check::
   FILE check-targets.cmake
-  DESTINATION lib/cmake/${EXPORT_NAME}
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}
 )
 install(
   FILES
     "${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config.cmake"
     "${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config-version.cmake"
-  DESTINATION lib/cmake/${EXPORT_NAME}
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}
 )
 

diff --git a/checkmk/CMakeLists.txt b/checkmk/CMakeLists.txt
index 1254ec2ce81037872d5e663a23367471b84d0821..4634b8dec229b891a6d18b24b59c179f7c1b5a03 100644 (file)
--- a/checkmk/CMakeLists.txt
+++ b/checkmk/CMakeLists.txt
@@ -7,7 +7,6 @@ configure_file(checkmk.in checkmk @ONLY)
 file(COPY doc/checkmk.1 DESTINATION man/man1)
 
 option(INSTALL_CHECKMK "Install checkmk" ON)
-include(GNUInstallDirs)
 if(INSTALL_CHECKMK)
   install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/checkmk
@@ -15,8 +14,8 @@ if(INSTALL_CHECKMK)
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
   )
   install(
-    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/man1
-    DESTINATION share/man
+    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}
   )
 endif(INSTALL_CHECKMK)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b126671d69ee9f24b6524bcac09202e6953c67b..15a102bbb70a07285b351e03c0cfc9bb1e4b0cc3 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,8 @@ target_link_libraries(check ${LIBM} ${LIBRT} ${SUBUNIT})
 target_include_directories(check
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-    $<INSTALL_INTERFACE:include>)
+    $<INSTALL_INTERFACE:include>
+)
 
 if(MSVC)
   add_definitions(-DCK_DLL_EXP=_declspec\(dllexport\))
@@ -59,10 +60,9 @@ endif (MSVC)
 
 install(TARGETS check 
   EXPORT check-targets
-  INCLUDES DESTINATION include
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib)
-
-install(FILES ${CMAKE_BINARY_DIR}/src/check.h DESTINATION include)
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)