diff options
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | CPackConfig.cmake | 11 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 4 | ||||
| -rw-r--r-- | config.h.cmake | 4 | ||||
| -rw-r--r-- | socket_wrapper-config-version.cmake.in | 2 | ||||
| -rw-r--r-- | socket_wrapper.pc.cmake | 4 |
6 files changed, 14 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9de79b4..efb30d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,12 @@ -project(socket_wrapper C) - # Required cmake version cmake_minimum_required(VERSION 2.8.5) +cmake_policy(SET CMP0048 NEW) + +project(socket_wrapper VERSION 1.1.9 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) -set(APPLICATION_VERSION_MAJOR "1") -set(APPLICATION_VERSION_MINOR "1") -set(APPLICATION_VERSION_PATCH "9") - -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 e1b83ac..6cf14a6 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 SSH library") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README") set(CPACK_PACKAGE_VENDOR "The SSH Library Development 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 @@ -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 ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}) set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries") set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C/C++ Headers") @@ -46,7 +43,7 @@ set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION set(CPACK_COMPONENT_HEADERS_DESCRIPTION "C/C++ header files for use with libssh") set(CPACK_COMPONENT_HEADERS_DEPENDS libraries) -#set(CPACK_COMPONENT_APPLICATIONS_GROUP "Runtime") +#set(CPACK_COMPONENT_PROJECTS_GROUP "Runtime") set(CPACK_COMPONENT_LIBRARIES_GROUP "Development") set(CPACK_COMPONENT_HEADERS_GROUP "Development") diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 93010f4..8fdb7f4 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -7,8 +7,8 @@ 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}") diff --git a/config.h.cmake b/config.h.cmake index b98ceff..5baa789 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/socket_wrapper-config-version.cmake.in b/socket_wrapper-config-version.cmake.in index 98f292c..4bff45e 100644 --- a/socket_wrapper-config-version.cmake.in +++ b/socket_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/socket_wrapper.pc.cmake b/socket_wrapper.pc.cmake index 6dc71f7..241e4d6 100644 --- a/socket_wrapper.pc.cmake +++ b/socket_wrapper.pc.cmake @@ -1,4 +1,4 @@ -Name: @APPLICATION_NAME@ +Name: @PROJECT_NAME@ Description: The socket_wrapper library -Version: @APPLICATION_VERSION@ +Version: @PROJECT_VERSION@ Libs: @LIB_INSTALL_DIR@/@SOCKET_WRAPPER_LIB@ |