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

@@ -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

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})

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)

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

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@

llarp/constants/version.cpp.in

@@ -15,8 +15,8 @@
 namespace llarp
 {
   // clang-format off
-  const std::array<uint16_t, 3> VERSION{{LLARP_VERSION_MAJ, LLARP_VERSION_MIN, LLARP_VERSION_PATCH}};
-  const std::array<uint64_t, 4> ROUTER_VERSION{{LLARP_PROTO_VERSION, LLARP_VERSION_MAJ, LLARP_VERSION_MIN, LLARP_VERSION_PATCH}};
+  const std::array<uint16_t, 3> VERSION{{LLARP_VERSION_MAJOR, LLARP_VERSION_MINOR, LLARP_VERSION_PATCH}};
+  const std::array<uint64_t, 4> 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@";