mirror of https://github.com/oxen-io/lokinet
Merge branch 'fedora/34' into fedora/35
commit
f54274fa4e
@ -1,28 +0,0 @@
|
||||
From: Jason Rhinelander <jason@imaginary.ca>
|
||||
Date: Fri, 13 Dec 2019 17:23:41 -0400
|
||||
Subject: Pass debian version as GIT_VERSION
|
||||
|
||||
---
|
||||
cmake/Version.cmake | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
|
||||
index 45037a0..d9fdaef 100644
|
||||
--- a/cmake/Version.cmake
|
||||
+++ b/cmake/Version.cmake
|
||||
@@ -1,4 +1,8 @@
|
||||
|
||||
+if(GIT_VERSION)
|
||||
+ set(VERSIONTAG "${GIT_VERSION}")
|
||||
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp")
|
||||
+else()
|
||||
find_package(Git QUIET)
|
||||
set(GIT_INDEX_FILE "${PROJECT_SOURCE_DIR}/.git/index")
|
||||
if(EXISTS ${GIT_INDEX_FILE} AND ( GIT_FOUND OR Git_FOUND) )
|
||||
@@ -18,5 +22,6 @@ else()
|
||||
set(VERSIONTAG "nogit")
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp")
|
||||
endif()
|
||||
+endif()
|
||||
|
||||
add_custom_target(genversion DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp")
|
Loading…
Reference in New Issue