From 801ac421795b97f69230c4404a7f3a6eb17f9dec Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 22 Mar 2020 12:55:16 +0100 Subject: cpack: add SSTP to package description --- cmake/cpack.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index 0f270cf8..e266cab9 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -6,7 +6,7 @@ SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(CPACK_PACKAGE_NAME "accel-ppp") SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov ") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "PPtP/L2TP/PPPoE server for Linux") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "PPtP/L2TP/PPPoE/SSTP server for Linux") SET(CPACK_PACKAGE_VENDOR "Dmitry Kozlov") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") -- cgit v1.2.3 From 9f3a32932eecb8fbf9ed4f747d7713380fbfc889 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 22 Mar 2020 12:56:22 +0100 Subject: cpack: remove duplicate version number definition Version number for Accel-PPP is already generated in CMakeLists.txt and thus it should not be manually defined in a second place (cmake/cpack.cmake). Reuse the version number obtained in CMakeLists.txt when building binary packages -> single source. Signed-off-by: Christian Poessinger --- CMakeLists.txt | 9 +++++---- cmake/cpack.cmake | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'cmake') diff --git a/CMakeLists.txt b/CMakeLists.txt index fe8ac947..4d86ff70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,6 @@ endif () project(accel-ppp C) -include(cmake/cpack.cmake) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-strict-aliasing -D_GNU_SOURCE -fPIC -rdynamic -Wno-unused-result") IF (NOT DEFINED LIB_SUFFIX) @@ -51,6 +49,9 @@ ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT) SET (ACCEL_PPP_VERSION 1.12.0) ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT) +# we must include cpack.cmake after generating the ACCEL_PPP_VERSION variable +include(cmake/cpack.cmake) + ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) @@ -62,7 +63,7 @@ if (NOT BUILD_DRIVER_ONLY) if (NOT DEFINED CRYPTO) set(CRYPTO OPENSSL) endif (NOT DEFINED CRYPTO) - + if (CRYPTO STREQUAL OPENSSL) find_library(CRYPTO_LIBRARY ssl HINTS ${CMAKE_SOURCE_DIR}/lib/linux/gcc/${BIT}/lib @@ -83,7 +84,7 @@ if (NOT BUILD_DRIVER_ONLY) else (CRYPTO STREQUAL OPENSSL) message(FATAL_ERROR "unknown CRYPTO type") endif (CRYPTO STREQUAL OPENSSL) - + add_subdirectory(accel-pppd) add_subdirectory(crypto) add_subdirectory(accel-cmd) diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index e266cab9..ffb53954 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -1,8 +1,9 @@ INCLUDE(InstallRequiredSystemLibraries) -SET(CPACK_PACKAGE_VERSION_MAJOR "1") -SET(CPACK_PACKAGE_VERSION_MINOR "12") -SET(CPACK_PACKAGE_VERSION_PATCH "0") +string(REPLACE "." ";" VERSION_LIST ${ACCEL_PPP_VERSION}) +list(GET VERSION_LIST 0 CPACK_PACKAGE_VERSION_MAJOR) +list(GET VERSION_LIST 1 CPACK_PACKAGE_VERSION_MINOR) +list(GET VERSION_LIST 2 CPACK_PACKAGE_VERSION_PATCH) SET(CPACK_PACKAGE_NAME "accel-ppp") SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov ") -- cgit v1.2.3