diff options
-rw-r--r-- | CMakeLists.txt | 10 | ||||
-rw-r--r-- | cmake/Modules/DefineInstallationPaths.cmake | 109 | ||||
-rw-r--r-- | include/CMakeLists.txt | 11 | ||||
-rw-r--r-- | libpamtest-config.cmake.in | 4 | ||||
-rw-r--r-- | pam_wrapper-config.cmake.in | 4 | ||||
-rw-r--r-- | pam_wrapper.pc.cmake | 4 | ||||
-rw-r--r-- | src/CMakeLists.txt | 17 | ||||
-rw-r--r-- | src/modules/CMakeLists.txt | 7 |
8 files changed, 23 insertions, 143 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 61be71a..de402f0 100644 --- 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 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 5eaaba6..252afec 100644 --- 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 3b8f841..f883d3d 100644 --- 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 a681007..c93b661 100644 --- 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 a3abf8e..587a54c 100644 --- 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 45e6a81..d2110a8 100644 --- 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 43ed16d..e7b2604 100644 --- 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() |