diff options
author | Andreas Schneider <asn@samba.org> | 2019-02-15 11:40:10 +0100 |
---|---|---|
committer | Andreas Schneider <asn@samba.org> | 2019-02-28 12:48:52 +0100 |
commit | fda5618f8cf6acb0bd2bc457d153a5e2d32a7261 (patch) | |
tree | 4f87568d22aa7e69fc0c4476aabc54f9dfc35bab | |
parent | 4995ab1fe2c05bc96749b5e3db9c6b83c444c942 (diff) | |
download | nss_wrapper-fda5618f8cf6acb0bd2bc457d153a5e2d32a7261.tar.gz nss_wrapper-fda5618f8cf6acb0bd2bc457d153a5e2d32a7261.tar.xz nss_wrapper-fda5618f8cf6acb0bd2bc457d153a5e2d32a7261.zip |
cmake: Require at least cmake 3.5.0
We should use modern cmake.
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 | 11 | ||||
-rw-r--r-- | ConfigureChecks.cmake | 4 | ||||
-rw-r--r-- | config.h.cmake | 4 | ||||
-rw-r--r-- | nss_wrapper-config-version.cmake.in | 2 | ||||
-rw-r--r-- | nss_wrapper.pc.cmake | 4 |
6 files changed, 14 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e91c266..ed4c4db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,12 @@ -project(nss_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(nss_wrapper VERSION 1.1.5 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) -set(APPLICATION_VERSION_MAJOR "1") -set(APPLICATION_VERSION_MINOR "1") -set(APPLICATION_VERSION_PATCH "5") - -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 e041451..827b518 100644 --- a/CPackConfig.cmake +++ b/CPackConfig.cmake @@ -2,20 +2,15 @@ # 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 SSH library") 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") - ### 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 set(CPACK_SOURCE_GENERATOR "TGZ") @@ -37,7 +32,7 @@ endif (WIN32) set(CPACK_PACKAGE_INSTALL_DIRECTORY "libssh") -set(CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION}) +set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}) set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries") set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C/C++ Headers") diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 41029d4..7a60360 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -8,8 +8,8 @@ include(CheckPrototypeDefinition) include(TestBigEndian) include(CheckCSourceRuns) -set(PACKAGE ${APPLICATION_NAME}) -set(VERSION ${APPLICATION_VERSION}) +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}") diff --git a/config.h.cmake b/config.h.cmake index b18dff2..ddb3582 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,8 +1,8 @@ /* 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}" diff --git a/nss_wrapper-config-version.cmake.in b/nss_wrapper-config-version.cmake.in index 98f292c..4bff45e 100644 --- a/nss_wrapper-config-version.cmake.in +++ b/nss_wrapper-config-version.cmake.in @@ -1,4 +1,4 @@ -set(PACKAGE_VERSION @APPLICATION_VERSION@) +set(PACKAGE_VERSION @PROJECT_VERSION@) # Check whether the requested PACKAGE_FIND_VERSION is compatible if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") diff --git a/nss_wrapper.pc.cmake b/nss_wrapper.pc.cmake index 9fca0f8..0bedeb1 100644 --- a/nss_wrapper.pc.cmake +++ b/nss_wrapper.pc.cmake @@ -1,4 +1,4 @@ -Name: @APPLICATION_NAME@ +Name: @PROJECT_NAME@ Description: The nss_wrapper library -Version: @APPLICATION_VERSION@ +Version: @PROJECT_VERSION@ Libs: @LIB_INSTALL_DIR@/@NSS_WRAPPER_LIB@ |