The branch, master has been updated
via 70bc551 README: Create a markdown file
via 5cc0681 gitlab-ci: Check last 20 commits on force push
via 066d850 cmake: Remove unused config.h variables
via 9a9250a cmake: Use GNUInstallDirs
from 24e5973 swrap: Fix a TODO
https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 70bc551dca142a7a4d6ed082244966957ca2e070
Author: Andreas Schneider <a...@samba.org>
Date: Tue Feb 19 16:18:10 2019 +0100
README: Create a markdown file
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 5cc06814060cd99245e7f072da077e5227d7698d
Author: Andreas Schneider <a...@samba.org>
Date: Tue Feb 19 16:10:16 2019 +0100
gitlab-ci: Check last 20 commits on force push
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 066d850c2853095bf756e7f5e9aeb198f6775b23
Author: Andreas Schneider <a...@samba.org>
Date: Wed Feb 20 10:34:04 2019 +0100
cmake: Remove unused config.h variables
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 9a9250a79143df88c3100e509e29c00536045b6b
Author: Andreas Schneider <a...@samba.org>
Date: Fri Feb 15 13:09:28 2019 +0100
cmake: Use GNUInstallDirs
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 4 +-
CMakeLists.txt | 6 +-
CPackConfig.cmake | 2 +-
ConfigureChecks.cmake | 4 -
README => README.md | 6 +-
cmake/Modules/DefineInstallationPaths.cmake | 109 ----------------------------
config.h.cmake | 5 --
doc/CMakeLists.txt | 2 +-
socket_wrapper-config.cmake.in | 2 +-
socket_wrapper.pc.cmake | 2 +-
src/CMakeLists.txt | 10 +--
11 files changed, 16 insertions(+), 136 deletions(-)
rename README => README.md (74%)
delete mode 100644 cmake/Modules/DefineInstallationPaths.cmake
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2bb099..365d834 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,12 +82,12 @@ fedora/csbuild:
script:
- |
if [[ -z "$CI_COMMIT_BEFORE_SHA" ]]; then
- export CI_COMMIT_BEFORE_SHA=$(git rev-parse HEAD^)
+ export CI_COMMIT_BEFORE_SHA=$(git rev-parse "${CI_COMMIT_SHA}~20")
fi
# Check if the commit exists in this branch
# This is not the case for a force push
- git branch --contains $CI_COMMIT_BEFORE_SHA 2>/dev/null || export
CI_COMMIT_BEFORE_SHA=$(git rev-parse HEAD^)
+ git branch --contains $CI_COMMIT_BEFORE_SHA 2>/dev/null || export
CI_COMMIT_BEFORE_SHA=$(git rev-parse "${CI_COMMIT_SHA}~20")
export CI_COMMIT_RANGE="$CI_COMMIT_BEFORE_SHA..$CI_COMMIT_SHA"
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/CPackConfig.cmake b/CPackConfig.cmake
index 6cf14a6..11b0314 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -4,7 +4,7 @@
### general settings
set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The SSH library")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
set(CPACK_PACKAGE_VENDOR "The SSH Library Development Team")
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 6cedb90..81aaa1c 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -9,10 +9,6 @@ include(TestBigEndian)
set(PACKAGE ${PROJECT_NAME})
set(VERSION ${PROJECT_VERSION})
-set(DATADIR ${DATA_INSTALL_DIR})
-set(LIBDIR ${LIB_INSTALL_DIR})
-set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
-set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
set(BINARYDIR ${CMAKE_BINARY_DIR})
set(SOURCEDIR ${CMAKE_SOURCE_DIR})
diff --git a/README b/README.md
similarity index 74%
rename from README
rename to README.md
index 12494cf..3e0ca5d 100644
--- a/README
+++ b/README.md
@@ -8,11 +8,11 @@ DESCRIPTION
More details can be found in the manpage:
- man -l ./doc/socket_wrapper.1
+ man -l ./doc/socket_wrapper.1
or the raw text version:
- less ./doc/socket_wrapper.1.txt
+ less ./doc/socket_wrapper.1.txt
For installation instructions please take a look at the README.install file.
@@ -21,4 +21,4 @@ MAILINGLIST
As the mailing list samba-technical is used and can be found here:
-https://lists.samba.org/mailman/listinfo/samba-technical
+* https://lists.samba.org/mailman/listinfo/samba-technical
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/config.h.cmake b/config.h.cmake
index 0207031..3c0cf01 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -4,11 +4,6 @@
/* Version number of package */
#cmakedefine VERSION "${PROJECT_VERSION}"
-#cmakedefine LOCALEDIR "${LOCALE_INSTALL_DIR}"
-#cmakedefine DATADIR "${DATADIR}"
-#cmakedefine LIBDIR "${LIBDIR}"
-#cmakedefine PLUGINDIR "${PLUGINDIR}"
-#cmakedefine SYSCONFDIR "${SYSCONFDIR}"
#cmakedefine BINARYDIR "${BINARYDIR}"
#cmakedefine SOURCEDIR "${SOURCEDIR}"
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)
--
Socket Wrapper Repository
