Commit 0bc3bbaf authored by David Thompson's avatar David Thompson
Browse files

Revert "Merge topic 'netgen-version-file'"

This reverts commit 8175feb7, reversing
changes made to 37d97322.
parent 8175feb7
...@@ -26,6 +26,3 @@ superbuild_add_project(netgen ...@@ -26,6 +26,3 @@ superbuild_add_project(netgen
# https://github.com/NGSolve/netgen/pull/70 # https://github.com/NGSolve/netgen/pull/70
superbuild_apply_patch(netgen disable-debian-assumptions superbuild_apply_patch(netgen disable-debian-assumptions
"Disable assumptions about Linux platforms") "Disable assumptions about Linux platforms")
# https://github.com/NGSolve/netgen/pull/90
superbuild_apply_patch(netgen make-version-file
"Write the version.txt file")
diff -u -Nru5 netgen-v6.2.2007/cmake/generate_version_file.cmake netgen-v6.2.2007.version-file/cmake/generate_version_file.cmake
--- netgen-v6.2.2007/cmake/generate_version_file.cmake 2020-07-23 14:51:48.000000000 -0400
+++ netgen-v6.2.2007.version-file/cmake/generate_version_file.cmake 2021-03-18 10:10:08.087536008 -0400
@@ -8,16 +8,22 @@
execute_process(COMMAND git describe --tags --match "v[0-9]*" --long --dirty WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} OUTPUT_VARIABLE git_version_string)
else()
# for source package files (generated for ubuntu builds on launchpad) read the version from version.txt
if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/../version.txt)
file(READ ${CMAKE_CURRENT_LIST_DIR}/../version.txt git_version_string )
+ string(STRIP "${git_version_string}" git_version_string)
else()
get_filename_component(git_version_string ${CMAKE_CURRENT_LIST_DIR}/.. NAME)
string(REGEX REPLACE "^netgen(.*)" "\\1" git_version_string "${git_version_string}")
endif()
endif()
+if (NOT git_version_string)
+ message(FATAL_ERROR
+ "Failed to determine a version.")
+endif ()
+
string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" NETGEN_VERSION_MAJOR "${git_version_string}")
string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" NETGEN_VERSION_MINOR "${git_version_string}")
string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" NETGEN_VERSION_PATCH "${git_version_string}")
string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-([0-9]+).*" "\\1" NETGEN_VERSION_TWEAK "${git_version_string}")
string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-([0-9a-z]+).*" "\\1" NETGEN_VERSION_HASH "${git_version_string}")
diff -u -Nru5 netgen-v6.2.2007/version.txt netgen-v6.2.2007.version-file/version.txt
--- netgen-v6.2.2007/version.txt 1969-12-31 19:00:00.000000000 -0500
+++ netgen-v6.2.2007.version-file/version.txt 2021-03-17 16:11:36.496454466 -0400
@@ -0,0 +1 @@
+v6.2.2007
...@@ -277,7 +277,5 @@ superbuild_set_selectable_source(aeva ...@@ -277,7 +277,5 @@ superbuild_set_selectable_source(aeva
SOURCE_DIR "source-aeva") SOURCE_DIR "source-aeva")
superbuild_set_revision(netgen superbuild_set_revision(netgen
# XXX: When updating, update the `netgen-make-version-file.patch` file as
# well if needed.
URL "https://www.computationalmodelbuilder.org/files/dependencies/netgen-v6.2.2007.tar.bz2" URL "https://www.computationalmodelbuilder.org/files/dependencies/netgen-v6.2.2007.tar.bz2"
URL_MD5 "e4ce27d5cd07fb49177fc814a10d9d4d") URL_MD5 "e4ce27d5cd07fb49177fc814a10d9d4d")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment