aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2019-02-20 10:35:27 +0100
committerAndreas Schneider <asn@samba.org>2019-02-28 12:49:33 +0100
commitbaf74fcbb776f459ce0dc987210d01b1bb5e5d64 (patch)
treef5caf815b46df5ee36581c72c860f7fa57cb2662
parent1d8fd4d1a5336df2bcebc8cde3a0a4f6ea8d6442 (diff)
downloadnss_wrapper-baf74fcbb776f459ce0dc987210d01b1bb5e5d64.tar.gz
nss_wrapper-baf74fcbb776f459ce0dc987210d01b1bb5e5d64.tar.xz
nss_wrapper-baf74fcbb776f459ce0dc987210d01b1bb5e5d64.zip
cmake: Use GNUInstallDirs
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
-rw-r--r--CMakeLists.txt13
-rw-r--r--cmake/Modules/DefineInstallationPaths.cmake109
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--nss_wrapper-config.cmake.in2
-rw-r--r--nss_wrapper.pc.cmake2
-rw-r--r--src/CMakeLists.txt11
6 files changed, 12 insertions, 127 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6edc59b..4507a15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,10 +29,10 @@ set(LIBRARY_SOVERSION "0")
# add definitions
include(DefineCMakeDefaults)
include(DefinePlatformDefaults)
-include(DefineInstallationPaths)
include(DefineOptions.cmake)
include(CPackConfig.cmake)
include(CompilerChecks.cmake)
+include(GNUInstallDirs)
# disallow in-source build
include(MacroEnsureOutOfSourceBuild)
@@ -49,11 +49,8 @@ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
# check subdirectories
add_subdirectory(src)
-install(
- PROGRAMS
- nss_wrapper.pl
- DESTINATION
- ${BIN_INSTALL_DIR})
+install(PROGRAMS nss_wrapper.pl
+ DESTINATION ${CMAKE_INSTALL_BINDIR})
if (UNIT_TESTING)
find_package(cmocka 1.1.0 REQUIRED)
@@ -78,7 +75,7 @@ install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper.pc
DESTINATION
- ${LIB_INSTALL_DIR}/pkgconfig
+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig
COMPONENT
pkgconfig
)
@@ -91,7 +88,7 @@ install(
${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper-config-version.cmake
${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper-config.cmake
DESTINATION
- ${CMAKE_INSTALL_DIR}/nss_wrapper
+ ${CMAKE_INSTALL_LIBDIR}/cmake/nss_wrapper
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/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 353168a..bc1265e 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
install(FILES
nss_wrapper.1
DESTINATION
- ${MAN_INSTALL_DIR}/man1)
+ ${CMAKE_INSTALL_MANDIR}/man1)
diff --git a/nss_wrapper-config.cmake.in b/nss_wrapper-config.cmake.in
index 3932a87..8f10f25 100644
--- a/nss_wrapper-config.cmake.in
+++ b/nss_wrapper-config.cmake.in
@@ -1 +1 @@
-set(NSS_WRAPPER_LIBRARY @LIB_INSTALL_DIR@/@NSS_WRAPPER_LIB@)
+set(NSS_WRAPPER_LIBRARY @CMAKE_INSTALL_LIBDIR@/@NSS_WRAPPER_LIB@)
diff --git a/nss_wrapper.pc.cmake b/nss_wrapper.pc.cmake
index 0bedeb1..fb9afd7 100644
--- a/nss_wrapper.pc.cmake
+++ b/nss_wrapper.pc.cmake
@@ -1,4 +1,4 @@
Name: @PROJECT_NAME@
Description: The nss_wrapper library
Version: @PROJECT_VERSION@
-Libs: @LIB_INSTALL_DIR@/@NSS_WRAPPER_LIB@
+Libs: @CMAKE_INSTALL_LIBDIR@/@NSS_WRAPPER_LIB@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index de80cd4..2103a0c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,12 +23,9 @@ set_target_properties(
${LIBRARY_SOVERSION}
)
-install(
- TARGETS
- nss_wrapper
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS nss_wrapper
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_L_LIBDIR})
set(NSS_WRAPPER_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}nss_wrapper${CMAKE_SHARED_LIBRARY_SUFFIX}" PARENT_SCOPE)