diff options
| author | Eshenko Dmitriy <snooppy@mail.ua> | 2020-03-22 15:35:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 15:35:11 +0300 |
| commit | c983d6f0763c572f656590b3ce74614c3ccbc276 (patch) | |
| tree | 395c864cc73d751862fabf3bd170d5e5e04b569e | |
| parent | 7afe0f075676219ab4b9e8dbfed294992e9f360b (diff) | |
| parent | 1fa099d818eaee2a4fb3b818ada110f2465ace79 (diff) | |
| download | accel-ppp-c983d6f0763c572f656590b3ce74614c3ccbc276.tar.gz accel-ppp-c983d6f0763c572f656590b3ce74614c3ccbc276.zip | |
Merge pull request #1 from c-po/version-number-improvements
Version number improvements
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | cmake/cpack.cmake | 9 |
2 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe8ac947..dd457777 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) @@ -40,9 +38,7 @@ ENDIF(NOT PCRE_LIBRARY) IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT) EXECUTE_PROCESS( - COMMAND git log --no-color - COMMAND head -n1 - COMMAND awk "{print $2}" + COMMAND git describe --tags --always WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} OUTPUT_VARIABLE ACCEL_PPP_VERSION ) @@ -51,6 +47,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 +61,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 +82,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 0f270cf8..ffb53954 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -1,12 +1,13 @@ 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 <xeb@mail.ru>") -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") |