diff options
author | Andreas Schneider <asn@samba.org> | 2019-02-15 13:09:28 +0100 |
---|---|---|
committer | Andreas Schneider <asn@samba.org> | 2019-02-20 17:23:41 +0100 |
commit | 9a9250a79143df88c3100e509e29c00536045b6b (patch) | |
tree | 731afc2315530af5ae601c27a94c6c7d944aa2b6 | |
parent | 24e597330ec6fbbdc149d798e70d6ed48729bd84 (diff) | |
download | socket_wrapper-9a9250a79143df88c3100e509e29c00536045b6b.tar.gz socket_wrapper-9a9250a79143df88c3100e509e29c00536045b6b.tar.xz socket_wrapper-9a9250a79143df88c3100e509e29c00536045b6b.zip |
cmake: Use GNUInstallDirs
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | cmake/Modules/DefineInstallationPaths.cmake | 109 | ||||
-rw-r--r-- | doc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | socket_wrapper-config.cmake.in | 2 | ||||
-rw-r--r-- | socket_wrapper.pc.cmake | 2 | ||||
-rw-r--r-- | src/CMakeLists.txt | 10 |
6 files changed, 10 insertions, 121 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38b3e17..1a161dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,10 +28,10 @@ set(LIBRARY_SOVERSION "0") # add definitions include(DefinePlatformDefaults) -include(DefineInstallationPaths) include(DefineOptions.cmake) include(CPackConfig.cmake) include(CompilerChecks.cmake) +include(GNUInstallDirs) # disallow in-source build include(MacroEnsureOutOfSourceBuild) @@ -63,7 +63,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/socket_wrapper.pc DESTINATION - ${LIB_INSTALL_DIR}/pkgconfig + ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT pkgconfig ) @@ -76,7 +76,7 @@ install( ${CMAKE_CURRENT_BINARY_DIR}/socket_wrapper-config-version.cmake ${CMAKE_CURRENT_BINARY_DIR}/socket_wrapper-config.cmake DESTINATION - ${CMAKE_INSTALL_DIR}/socket_wrapper + ${CMAKE_INSTALL_LIBDIR}/cmake/socket_wrapper COMPONENT devel ) diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake deleted file mode 100644 index a415f3d..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 "sounds" CACHE PATH "-") - set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-") -endif () diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 57552d6..f89bc88 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,4 @@ install(FILES socket_wrapper.1 DESTINATION - ${MAN_INSTALL_DIR}/man1) + ${CMAKE_INSTALL_MANDIR}/man1) diff --git a/socket_wrapper-config.cmake.in b/socket_wrapper-config.cmake.in index 7bedd79..bbbe337 100644 --- a/socket_wrapper-config.cmake.in +++ b/socket_wrapper-config.cmake.in @@ -1 +1 @@ -set(SOCKET_WRAPPER_LIBRARY @LIB_INSTALL_DIR@/@SOCKET_WRAPPER_LIB@) +set(SOCKET_WRAPPER_LIBRARY @CMAKE_INSTALL_FULL_LIBDIR@/@SOCKET_WRAPPER_LIB@) diff --git a/socket_wrapper.pc.cmake b/socket_wrapper.pc.cmake index 241e4d6..80d205a 100644 --- a/socket_wrapper.pc.cmake +++ b/socket_wrapper.pc.cmake @@ -1,4 +1,4 @@ Name: @PROJECT_NAME@ Description: The socket_wrapper library Version: @PROJECT_VERSION@ -Libs: @LIB_INSTALL_DIR@/@SOCKET_WRAPPER_LIB@ +Libs: @CMAKE_INSTALL_LIBDIR@/@SOCKET_WRAPPER_LIB@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 952df75..73f8cd0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,12 +20,10 @@ if (DEFINED DEFAULT_LINK_FLAGS) LINK_FLAGS ${DEFAULT_LINK_FLAGS}) endif() -install( - TARGETS - socket_wrapper - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} +install(TARGETS socket_wrapper + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set(SOCKET_WRAPPER_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}socket_wrapper${CMAKE_SHARED_LIBRARY_SUFFIX}" PARENT_SCOPE) |