From 3dd3d48fbb34783eca5983979ef61e6f82c54eaa Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Sat, 18 Apr 2020 15:02:22 -0300 Subject: [PATCH] Consolidate cmake vars & definitions CMake will set version variables itself if you give the version in the project(), which is cleaner. Also removes some (nearly) duplicate definitions and settings added in basic_definitions.cmake for unknown reasons. Removes some redundant settings (name, description, version) from the cpack settings which already default to the values from the project() call. --- CMakeLists.txt | 19 +++++++++---------- cmake/basic_definitions.cmake | 8 -------- cmake/installer.cmake | 5 ----- docs/CMakeLists.txt | 4 ++-- docs/Doxyfile.in | 2 +- llarp/constants/version.cpp.in | 4 ++-- 6 files changed, 14 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8412389f4..008a20813 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5.1) # xenial's cmake version +cmake_minimum_required(VERSION 3.10) # bionic's cmake version find_program(CCACHE_PROGRAM ccache) if(CCACHE_PROGRAM) @@ -6,15 +6,14 @@ if(CCACHE_PROGRAM) endif() set(PROJECT_NAME lokinet) -project(${PROJECT_NAME} C CXX) - -set(LLARP_VERSION_MAJOR 0) -set(LLARP_VERSION_MINOR 7) -set(LLARP_VERSION_PATCH 0) - -add_definitions(-DLLARP_VERSION_MAJOR=${LLARP_VERSION_MAJOR}) -add_definitions(-DLLARP_VERSION_MINOR=${LLARP_VERSION_MINOR}) -add_definitions(-DLLARP_VERSION_PATCH=${LLARP_VERSION_PATCH}) +project(${PROJECT_NAME} + VERSION 0.7.0 + DESCRIPTION "lokinet - IP packet onion router" + LANGUAGES C CXX) + +add_definitions(-DLLARP_VERSION_MAJOR=${lokinet_VERSION_MAJOR}) +add_definitions(-DLLARP_VERSION_MINOR=${lokinet_VERSION_MINOR}) +add_definitions(-DLLARP_VERSION_PATCH=${lokinet_VERSION_PATCH}) # Core options diff --git a/cmake/basic_definitions.cmake b/cmake/basic_definitions.cmake index 772965bac..b372f76df 100644 --- a/cmake/basic_definitions.cmake +++ b/cmake/basic_definitions.cmake @@ -18,11 +18,3 @@ get_filename_component(ABYSS_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/inclu set(LIBTUNTAP_SRC ${TT_ROOT}/tuntap.cpp ${TT_ROOT}/tuntap_log.cpp) - -set(LLARP_VERSION_MAJOR 0) -set(LLARP_VERSION_MINOR 7) -set(LLARP_VERSION_PATCH 0) -set(LLARP_VERSION "v${LLARP_VERSION_MAJOR}.${LLARP_VERSION_MINOR}.${LLARP_VERSION_PATCH}") -add_definitions(-DLLARP_VERSION_MAJ=${LLARP_VERSION_MAJOR}) -add_definitions(-DLLARP_VERSION_MIN=${LLARP_VERSION_MINOR}) -add_definitions(-DLLARP_VERSION_PATCH=${LLARP_VERSION_PATCH}) diff --git a/cmake/installer.cmake b/cmake/installer.cmake index 76f9fc79f..418ae1cc4 100644 --- a/cmake/installer.cmake +++ b/cmake/installer.cmake @@ -1,11 +1,6 @@ -set(CPACK_PACKAGE_NAME "lokinet") set(CPACK_PACKAGE_VENDOR "lokinet.org") set(CPACK_PACKAGE_HOMEPAGE_URL "https://lokinet.org/") -set(CPACK_PACKAGE_DESCRIPTION "lokinet - IP packet onion router") set(CPACK_PACKAGE_README_FILE "${CMAKE_SOURCE_DIR}/readme.md") -set(CPACK_PACKAGE_VERSION_MAJOR "${LLARP_VERSION_MAJOR}") -set(CPACK_PACKAGE_VERSION_MINOR "${LLARP_VERSION_MINOR}") -set(CPACK_PACKAGE_VERSION_PATCH "${LLARP_VERSION_PATCH}") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt") if(WIN32) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 5565163cc..679e413fe 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -24,8 +24,8 @@ add_custom_command( OUTPUT html/index.html COMMAND ${SPHINX_BUILD} -Dbreathe_projects.lokinet=${CMAKE_CURRENT_BINARY_DIR}/doxyxml - -Dversion=${LLARP_VERSION} -Drelease=${LLARP_VERSION} - -Aversion=${LLARP_VERSION} -Aversions=${LLARP_VERSION_MAJOR},${LLARP_VERSION_MINOR},${LLARP_VERSION_PATCH} + -Dversion=${lokinet_VERSION} -Drelease=${lokinet_VERSION} + -Aversion=${lokinet_VERSION} -Aversions=${lokinet_VERSION_MAJOR},${lokinet_VERSION_MINOR},${lokinet_VERSION_PATCH} -b html ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/html DEPENDS diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in index 63f4897a7..95afd645f 100644 --- a/docs/Doxyfile.in +++ b/docs/Doxyfile.in @@ -1,5 +1,5 @@ PROJECT_NAME = "Lokinet" -PROJECT_NUMBER = v@LLARP_VERSION@ +PROJECT_NUMBER = v@lokinet_VERSION@ PROJECT_BRIEF = "Anonymous, decentralized and IP based overlay network for the internet." OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@ STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@ @PROJECT_BINARY_DIR@ diff --git a/llarp/constants/version.cpp.in b/llarp/constants/version.cpp.in index 292490bcd..67c3cfa9c 100644 --- a/llarp/constants/version.cpp.in +++ b/llarp/constants/version.cpp.in @@ -15,8 +15,8 @@ namespace llarp { // clang-format off - const std::array VERSION{{LLARP_VERSION_MAJ, LLARP_VERSION_MIN, LLARP_VERSION_PATCH}}; - const std::array ROUTER_VERSION{{LLARP_PROTO_VERSION, LLARP_VERSION_MAJ, LLARP_VERSION_MIN, LLARP_VERSION_PATCH}}; + const std::array VERSION{{LLARP_VERSION_MAJOR, LLARP_VERSION_MINOR, LLARP_VERSION_PATCH}}; + const std::array ROUTER_VERSION{{LLARP_PROTO_VERSION, LLARP_VERSION_MAJOR, LLARP_VERSION_MINOR, LLARP_VERSION_PATCH}}; const char* const VERSION_STR = LLARP_VERSION_STR; const char* const VERSION_TAG = "@VERSIONTAG@"; const char* const VERSION_FULL = LLARP_NAME "-" LLARP_VERSION_STR "-@VERSIONTAG@";