diff options
| author | Andreas Schneider <asn@samba.org> | 2019-10-17 15:18:38 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-10-20 14:59:54 +0200 |
| commit | 78f8f278d3aa46b1e8230f1dc2e40f9c15790cbc (patch) | |
| tree | 250e3f30b8d8416abed717dfdf2e41797e9fc273 | |
| parent | 64508d9dfe62d1c1d9ccce6c5514d0ebdbc8f516 (diff) | |
| download | resolv_wrapper-78f8f278d3aa46b1e8230f1dc2e40f9c15790cbc.tar.gz resolv_wrapper-78f8f278d3aa46b1e8230f1dc2e40f9c15790cbc.tar.xz resolv_wrapper-78f8f278d3aa46b1e8230f1dc2e40f9c15790cbc.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 | 8 | ||||
| -rw-r--r-- | config.h.cmake | 4 | ||||
| -rw-r--r-- | resolv_wrapper.pc.cmake | 4 |
5 files changed, 15 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 364ca2f..911b916 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,12 @@ -project(resolv_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(resolv_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 1f889f6..b19eabf 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 resolv wrapper") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") set(CPACK_PACKAGE_VENDOR "The 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_MAJOR}") ### source generator @@ -37,7 +34,7 @@ endif (WIN32) set(CPACK_PACKAGE_INSTALL_DIRECTORY "libssh") -set(CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION}) +set(CPACK_PACKAGE_FILE_NAME ${PROJECT_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 0990940..9748b3a 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -7,15 +7,15 @@ include(CheckStructHasMember) include(CheckPrototypeDefinition) include(TestBigEndian) -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}") set(SYSCONFDIR ${SYSCONF_INSTALL_DIR}) -set(BINARYDIR ${CMAKE_BINARY_DIR}) -set(SOURCEDIR ${CMAKE_SOURCE_DIR}) +set(BINARYDIR ${resolv_wrapper_BINARY_DIR}) +set(SOURCEDIR ${resolv_wrapper_SOURCE_DIR}) function(COMPILER_DUMPVERSION _OUTPUT_VERSION) # Remove whitespaces from the argument. diff --git a/config.h.cmake b/config.h.cmake index e3acc8a..86b655a 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/resolv_wrapper.pc.cmake b/resolv_wrapper.pc.cmake index ff74671..ea8b785 100644 --- a/resolv_wrapper.pc.cmake +++ b/resolv_wrapper.pc.cmake @@ -1,4 +1,4 @@ -Name: @APPLICATION_NAME@ +Name: @PROJECT_NAME@ Description: The resolv_wrapper library -Version: @APPLICATION_VERSION@ +Version: @PROJECT_VERSION@ Libs: @LIB_INSTALL_DIR@/@RESOLV_WRAPPER_LIB@ |