diff --git a/cmake/basic_definitions.cmake b/cmake/basic_definitions.cmake index b372f76df..772965bac 100644 --- a/cmake/basic_definitions.cmake +++ b/cmake/basic_definitions.cmake @@ -18,3 +18,11 @@ 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/docs/CMakeLists.txt b/docs/CMakeLists.txt index 32cb9535e..5565163cc 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -24,7 +24,7 @@ add_custom_command( OUTPUT html/index.html COMMAND ${SPHINX_BUILD} -Dbreathe_projects.lokinet=${CMAKE_CURRENT_BINARY_DIR}/doxyxml - -Dversion=${LLARP_VERSION} -Drelease=${LOKIMQ_VERSION} + -Dversion=${LLARP_VERSION} -Drelease=${LLARP_VERSION} -Aversion=${LLARP_VERSION} -Aversions=${LLARP_VERSION_MAJOR},${LLARP_VERSION_MINOR},${LLARP_VERSION_PATCH} -b html ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/html diff --git a/llarp/constants/version.h b/llarp/constants/version.h index e7099db99..3434517c6 100644 --- a/llarp/constants/version.h +++ b/llarp/constants/version.h @@ -6,10 +6,6 @@ #define LLARP_NAME "lokinet" -#define LLARP_VERSION_MAJ 0 -#define LLARP_VERSION_MIN 7 -#define LLARP_VERSION_PATCH 0 - #define LLARP_DEFAULT_NETID "lokinet" #ifndef LLARP_RELEASE_MOTTO