cmake: Use GNUInstallDirs

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61be71ada228a2798d13f63af91afa9790466982..de402f09dffc2a14005a8148ebf62d3647436d7f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ set(PAMTEST_LIBRARY_SOVERSION "0")
 
 # add definitions
 include(DefinePlatformDefaults)
-include(DefineInstallationPaths)
+include(GNUInstallDirs)
 include(DefineOptions.cmake)
 include(CPackConfig.cmake)
 include(CompilerChecks.cmake)
@@ -62,7 +62,7 @@ install(
   FILES
     ${CMAKE_CURRENT_BINARY_DIR}/pam_wrapper.pc
   DESTINATION
-    ${LIB_INSTALL_DIR}/pkgconfig
+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig
   COMPONENT
     pkgconfig
 )
@@ -72,7 +72,7 @@ install(
   FILES
     ${CMAKE_CURRENT_BINARY_DIR}/libpamtest.pc
   DESTINATION
-    ${LIB_INSTALL_DIR}/pkgconfig
+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig
   COMPONENT
     pkgconfig
 )
@@ -85,7 +85,7 @@ install(
         ${CMAKE_CURRENT_BINARY_DIR}/pam_wrapper-config-version.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/pam_wrapper-config.cmake
     DESTINATION
-        ${CMAKE_INSTALL_DIR}/pam_wrapper
+        ${CMAKE_INSTALL_LIBDIR}/cmake/pam_wrapper
     COMPONENT
         devel
 )
@@ -100,7 +100,7 @@ install(
         ${CMAKE_CURRENT_BINARY_DIR}/libpamtest-config.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/libpamtest-config-version.cmake
     DESTINATION
-        ${CMAKE_INSTALL_DIR}/libpamtest
+        ${CMAKE_INSTALL_LIBDIR}/cmake/libpamtest
     COMPONENT
         devel
 )

diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake
deleted file mode 100644 (file)
index 88e08ca..0000000
--- a/cmake/Modules/DefineInstallationPaths.cmake
+++ /dev/null
@@ -1,109 +0,0 @@
-if (UNIX OR OS2)
-  IF (NOT APPLICATION_NAME)
-    MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
-    SET(APPLICATION_NAME ${PROJECT_NAME})
-  ENDIF (NOT APPLICATION_NAME)
-
-  # Suffix for Linux
-  SET(LIB_SUFFIX
-    CACHE STRING "Define suffix of directory name (32/64)"
-  )
-
-  SET(EXEC_INSTALL_PREFIX
-    "${CMAKE_INSTALL_PREFIX}"
-    CACHE PATH  "Base directory for executables and libraries"
-  )
-  SET(SHARE_INSTALL_PREFIX
-    "${CMAKE_INSTALL_PREFIX}/share"
-    CACHE PATH "Base directory for files which go to share/"
-  )
-  SET(DATA_INSTALL_PREFIX
-    "${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}"
-    CACHE PATH "The parent directory where applications can install their data")
-
-  # The following are directories where stuff will be installed to
-  SET(BIN_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/bin"
-    CACHE PATH "The ${APPLICATION_NAME} binary install dir (default prefix/bin)"
-  )
-  SET(SBIN_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/sbin"
-    CACHE PATH "The ${APPLICATION_NAME} sbin install dir (default prefix/sbin)"
-  )
-  SET(LIB_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
-    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/lib)"
-  )
-  SET(LIBEXEC_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/libexec"
-    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
-  )
-  SET(PLUGIN_INSTALL_DIR
-    "${LIB_INSTALL_DIR}/${APPLICATION_NAME}"
-    CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_NAME})"
-  )
-  SET(INCLUDE_INSTALL_DIR
-    "${CMAKE_INSTALL_PREFIX}/include"
-    CACHE PATH "The subdirectory to the header prefix (default prefix/include)"
-  )
-
-  set(CMAKE_INSTALL_DIR
-    "${LIB_INSTALL_DIR}/cmake"
-    CACHE PATH "The subdirectory to install cmake config files")
-
-  SET(DATA_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}"
-    CACHE PATH "The parent directory where applications can install their data (default prefix/share/${APPLICATION_NAME})"
-  )
-  SET(HTML_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/doc/HTML"
-    CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
-  )
-  SET(ICON_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/icons"
-    CACHE PATH "The icon install dir (default data/icons/)"
-  )
-  SET(SOUND_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/sounds"
-    CACHE PATH "The install dir for sound files (default data/sounds)"
-  )
-
-  SET(LOCALE_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/locale"
-    CACHE PATH "The install dir for translations (default prefix/share/locale)"
-  )
-
-  SET(XDG_APPS_DIR
-    "${SHARE_INSTALL_PREFIX}/applications/"
-    CACHE PATH "The XDG apps dir"
-  )
-  SET(XDG_DIRECTORY_DIR
-    "${SHARE_INSTALL_PREFIX}/desktop-directories"
-    CACHE PATH "The XDG directory"
-  )
-
-  SET(SYSCONF_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/etc"
-    CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
-  )
-  SET(MAN_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/man"
-    CACHE PATH "The ${APPLICATION_NAME} man install dir (default prefix/man)"
-  )
-  SET(INFO_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/info"
-    CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)"
-  )
-else()
-  # Same same
-  set(BIN_INSTALL_DIR "bin" CACHE PATH "-")
-  set(SBIN_INSTALL_DIR "sbin" CACHE PATH "-")
-  set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "-")
-  set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-")
-  set(CMAKE_INSTALL_DIR "CMake" CACHE PATH "-")
-  set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-")
-  set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-")
-  set(ICON_INSTALL_DIR "icons" CACHE PATH "-")
-  set(SOUND_INSTALL_DIR "soudns" CACHE PATH "-")
-  set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-")
-endif ()

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 5eaaba6239374cfe0c38cf99093721b3f469e94e..252afec4083fe51bd5a344473d79d25ca4f72378 100644 (file)
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -4,11 +4,6 @@ set(libpamtest_HDRS
   libpamtest.h
 )
 
-install(
-  FILES
-    ${libpamtest_HDRS}
-  DESTINATION
-    ${INCLUDE_INSTALL_DIR}
-  COMPONENT
-    headers
-)
+install(FILES ${libpamtest_HDRS}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+        COMPONENT headers)

diff --git a/libpamtest-config.cmake.in b/libpamtest-config.cmake.in
index 3b8f84163aabdb4db2991d5c8634420b39a0bb0b..f883d3de19e960a9b1855cbfde64debd1cefb0fb 100644 (file)
--- a/libpamtest-config.cmake.in
+++ b/libpamtest-config.cmake.in
@@ -7,5 +7,5 @@ else()
     set(LIBPAMTEST_INCLUDE_DIR @INCLUDE_INSTALL_DIR@)
 endif()
 
-set(LIBPAMTEST_LIBRARY @LIB_INSTALL_DIR@/@LIBPAMTEST_LIBRARY_NAME@)
-set(LIBPAMTEST_LIBRARIES @LIB_INSTALL_DIR@/@LIBPAMTEST_LIBRARY_NAME@)
+set(LIBPAMTEST_LIBRARY @CMAKE_INSTALL_LIBDIR@/@LIBPAMTEST_LIBRARY_NAME@)
+set(LIBPAMTEST_LIBRARIES @CMAKE_INSTALL_LIBDIR@/@LIBPAMTEST_LIBRARY_NAME@)

diff --git a/pam_wrapper-config.cmake.in b/pam_wrapper-config.cmake.in
index a68100701923b09d29aa86ee337dfb2ae3b67aa3..c93b661a93c0c9a69a1eb3f7c338e1e8b54dd80f 100644 (file)
--- a/pam_wrapper-config.cmake.in
+++ b/pam_wrapper-config.cmake.in
@@ -1,2 +1,2 @@
-set(PAM_WRAPPER_LIBRARY @LIB_INSTALL_DIR@/@PAM_WRAPPER_LIB@)
-set(PAM_WRAPPER_MODULE_DIR @LIB_INSTALL_DIR@/@PROJECT_NAME@)
+set(PAM_WRAPPER_LIBRARY @CMAKE_INSTALL_LIBDIR@/@PAM_WRAPPER_LIB@)
+set(PAM_WRAPPER_MODULE_DIR @CMAKE_INSTALL_LIBDIR@/@PROJECT_NAME@)

diff --git a/pam_wrapper.pc.cmake b/pam_wrapper.pc.cmake
index a3abf8e5588d788e0e5f3f51ea47b80ca19314ce..587a54ca08fdff995c7c147aa6922d75c1472406 100644 (file)
--- a/pam_wrapper.pc.cmake
+++ b/pam_wrapper.pc.cmake
@@ -1,6 +1,6 @@
-modules=@LIB_INSTALL_DIR@/pam_wrapper
+modules=@CMAKE_INSTALL_LIBDIR@/pam_wrapper
 
 Name: @PROJECT_NAME@
 Description: The pam_wrapper library
 Version: @PROJECT_VERSION@
-Libs: @LIB_INSTALL_DIR@/@PAM_WRAPPER_LIB@
+Libs: @CMAKE_INSTALL_LIBDIR@/@PAM_WRAPPER_LIB@

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 45e6a81f3c8b0e88b49e9d3f0a3726c7a6bf5185..d2110a8ad74ad9412c8cdd73e33c88722ab2d8b6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,13 +31,10 @@ set_target_properties(
         ${LIBRARY_SOVERSION}
 )
 
-install(
-  TARGETS
-    pam_wrapper
-  RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS pam_wrapper
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 ###########################################################
 ### libpamtest
@@ -70,9 +67,9 @@ set_target_properties(pamtest
         SOVERSION ${LIBRARY_SOVERSION})
 
 install(TARGETS pamtest
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 add_subdirectory(modules)
 add_subdirectory(python)

diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 43ed16dccd7eae59d653ddd3a9700804de0723cc..e7b2604de4e6e9da9603086f5f63156692aee492 100644 (file)
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -7,9 +7,6 @@ if (HAVE_PAM_MISC)
        list(APPEND PAM_LIBRARIES pam_misc)
 endif (HAVE_PAM_MISC)
 
-set(PWRAP_PRIVATE_LIBRARIES
-       ${LIB_INSTALL_DIR}/pam_wrapper)
-
 foreach(_PAM_MODULE ${PAM_MODULES})
        add_library(${_PAM_MODULE} MODULE ${_PAM_MODULE}.c)
     target_include_directories(${_PAM_MODULE}
@@ -24,7 +21,7 @@ foreach(_PAM_MODULE ${PAM_MODULES})
        install(
                TARGETS
                        ${_PAM_MODULE}
-               LIBRARY DESTINATION ${PWRAP_PRIVATE_LIBRARIES}
-               ARCHIVE DESTINATION ${PWRAP_PRIVATE_LIBRARIES})
+               LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/pam_wrapper
+               ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/pam_wrapper)
 endforeach()