diff options
author | Andreas Schneider <asn@samba.org> | 2020-01-31 12:59:31 +0100 |
---|---|---|
committer | Andreas Schneider <asn@samba.org> | 2020-01-31 13:04:15 +0100 |
commit | 68aa7b7826e84c9fd15bdd0618dd4a2b30896c0d (patch) | |
tree | 2d4b5bb6d99f00f48daa5a580abc56933d8b5ca9 | |
parent | 8906d52333bcdf370ca436b8ee6dd64b58291354 (diff) | |
download | pam_wrapper-68aa7b7826e84c9fd15bdd0618dd4a2b30896c0d.tar.gz pam_wrapper-68aa7b7826e84c9fd15bdd0618dd4a2b30896c0d.tar.xz pam_wrapper-68aa7b7826e84c9fd15bdd0618dd4a2b30896c0d.zip |
cmake: Require at least cmake 3.5.0
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
-rw-r--r-- | CMakeLists.txt | 13 | ||||
-rw-r--r-- | CPackConfig.cmake | 9 | ||||
-rw-r--r-- | ConfigureChecks.cmake | 14 | ||||
-rw-r--r-- | config.h.cmake | 9 | ||||
-rw-r--r-- | pam_wrapper.pc.cmake | 4 |
5 files changed, 16 insertions, 33 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b0f148..fe635a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,12 @@ -project(pam_wrapper C) - # Required cmake version -cmake_minimum_required(VERSION 2.8.0) +cmake_minimum_required(VERSION 3.5.0) +cmake_policy(SET CMP0048 NEW) + +project(pam_wrapper VERSION 1.0.7 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) -set(APPLICATION_VERSION_MAJOR "1") -set(APPLICATION_VERSION_MINOR "0") -set(APPLICATION_VERSION_PATCH "7") - -set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}") - # SOVERSION scheme: CURRENT.AGE.REVISION # If there was an incompatible interface change: # Increment CURRENT. Set AGE and REVISION to 0 diff --git a/CPackConfig.cmake b/CPackConfig.cmake index ca9b22a..6081d8f 100644 --- a/CPackConfig.cmake +++ b/CPackConfig.cmake @@ -2,7 +2,7 @@ # http://www.cmake.org/Wiki/CMake:CPackConfiguration ### general settings -set(CPACK_PACKAGE_NAME ${APPLICATION_NAME}) +set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The pam_wrapper") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") set(CPACK_PACKAGE_VENDOR "Samba Team") @@ -11,10 +11,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") ### versions -set(CPACK_PACKAGE_VERSION_MAJOR "${APPLICATION_VERSION_MAJOR}") -set(CPACK_PACKAGE_VERSION_MINOR "${APPLICATION_VERSION_MINOR}") -set(CPACK_PACKAGE_VERSION_PATCH "${APPLICATION_VERSION_PATCH}") -set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) ### source generator @@ -24,6 +21,6 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSIO set(CPACK_PACKAGE_INSTALL_DIRECTORY "pam_wrapper") -set(CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION}) +set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}) include(CPack) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 0286eff..ce4a7e5 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -7,15 +7,11 @@ include(CheckStructHasMember) include(CheckPrototypeDefinition) include(TestBigEndian) -set(PACKAGE ${APPLICATION_NAME}) -set(VERSION ${APPLICATION_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}) +set(PACKAGE ${PROJECT_NAME}) +set(VERSION ${PROJECT_VERSION}) + +set(BINARYDIR ${pam_wrapper_BINARY_DIR}) +set(SOURCEDIR ${pam_wrapper_SOURCE_DIR}) function(COMPILER_DUMPVERSION _OUTPUT_VERSION) # Remove whitespaces from the argument. diff --git a/config.h.cmake b/config.h.cmake index 0b18d43..7e4451d 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,14 +1,9 @@ /* Name of package */ -#cmakedefine PACKAGE "${APPLICATION_NAME}" +#cmakedefine PACKAGE "${PROJECT_NAME}" /* Version number of package */ -#cmakedefine VERSION "${APPLICATION_VERSION}" +#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/pam_wrapper.pc.cmake b/pam_wrapper.pc.cmake index c1f407b..a3abf8e 100644 --- a/pam_wrapper.pc.cmake +++ b/pam_wrapper.pc.cmake @@ -1,6 +1,6 @@ modules=@LIB_INSTALL_DIR@/pam_wrapper -Name: @APPLICATION_NAME@ +Name: @PROJECT_NAME@ Description: The pam_wrapper library -Version: @APPLICATION_VERSION@ +Version: @PROJECT_VERSION@ Libs: @LIB_INSTALL_DIR@/@PAM_WRAPPER_LIB@ |