1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
|
From: Gard Spreemann <gspr@nonempty.org>
Date: Tue, 2 Aug 2022 15:12:07 +0200
Subject: Ensure that the version cache is not accidentally ignored
Upstream attempts to build up version information using git. It seems
that this information can take precedence over the manually filled
cache, so don't do this.
---
ns-3.45/build-support/custom-modules/ns3-versioning.cmake | 13 -------------
1 file changed, 13 deletions(-)
--- a/ns-3.45/build-support/custom-modules/ns3-versioning.cmake
+++ b/ns-3.45/build-support/custom-modules/ns3-versioning.cmake
@@ -83,19 +83,6 @@
endif()
set(HAS_NS3_TAGS False)
- mark_as_advanced(GIT)
- find_program(GIT git)
- if("${GIT}" STREQUAL "GIT-NOTFOUND")
- message(
- STATUS
- "Git was not found. Build version embedding won't be enabled if version.cache is not found."
- )
- else()
- if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
- # If the git history exists, check if ns-3 git tags were found
- check_git_repo_has_ns3_tags(HAS_NS3_TAGS NS3_VERSION_TAG)
- endif()
- endif()
set(version_cache_file ${PROJECT_SOURCE_DIR}/src/core/model/version.cache)
|