From 2772ca44539411b5179eb9fd87afe591d4d688f6 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 7 Feb 2020 21:56:32 +0100
Subject: [PATCH] add version tag to c++ docs
---
CMakeModules/prepare_version_tag.cmake | 8 ++++----
docs/doxygen/CMakeLists.txt | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeModules/prepare_version_tag.cmake b/CMakeModules/prepare_version_tag.cmake
index bfe3fadab..1855b7d6f 100644
--- a/CMakeModules/prepare_version_tag.cmake
+++ b/CMakeModules/prepare_version_tag.cmake
@@ -15,9 +15,9 @@ else()
endif()
execute_process(COMMAND git describe --tags --abbrev=0
- OUTPUT_VARIABLE VERSION_TAGS
+ OUTPUT_VARIABLE ASAPO_VERSION_TAG
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
-string(STRIP ${VERSION_TAGS} VERSION_TAGS)
+string(STRIP ${ASAPO_VERSION_TAG} ASAPO_VERSION_TAG)
execute_process(COMMAND git rev-parse --short HEAD
OUTPUT_VARIABLE VERSION_COMMIT
@@ -40,9 +40,9 @@ endif()
if (${BRANCH} STREQUAL "develop")
- SET (ASAPO_VERSION_PYTHON ${VERSION_TAGS}.${BRANCH}.${VERSION_COMMIT})
+ SET (ASAPO_VERSION_PYTHON ${ASAPO_VERSION_TAG}.${BRANCH}.${VERSION_COMMIT})
else()
- SET (ASAPO_VERSION_PYTHON ${VERSION_TAGS}.${BRANCH}.latest)
+ SET (ASAPO_VERSION_PYTHON ${ASAPO_VERSION_TAG}.${BRANCH}.latest)
endif()
diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt
index 60f04d6bd..52fbc17f8 100644
--- a/docs/doxygen/CMakeLists.txt
+++ b/docs/doxygen/CMakeLists.txt
@@ -6,19 +6,19 @@ if(DOXYGEN_EXECUTABLE)
add_custom_target(
docs-cpp-producer
COMMAND
- PROJECT_NUMBER=${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
+ PROJECT_NUMBER=${ASAPO_VERSION_TAG}-${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
WORKING_DIRECTORY producer
)
add_custom_target(
docs-cpp-consumer
COMMAND
- PROJECT_NUMBER=${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
+ PROJECT_NUMBER=${ASAPO_VERSION_TAG}-${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
WORKING_DIRECTORY consumer
)
add_custom_target(
docs-cpp ALL
COMMAND
- PROJECT_NUMBER=${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
+ PROJECT_NUMBER=${ASAPO_VERSION_TAG}-${ASAPO_VERSION} ${DOXYGEN_EXECUTABLE} doxygen.ini VERBATIM
)
add_dependencies(docs-cpp docs-cpp-producer docs-cpp-consumer)
else()
--
GitLab