You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/sci-libs/p4est/files/p4est-2.8-set_version.patch

78 lines
2.5 KiB

diff --git a/cmake/git.cmake b/cmake/git.cmake
index dd6009e..7c5c8f3 100644
--- a/cmake/git.cmake
+++ b/cmake/git.cmake
@@ -1,36 +1,3 @@
# --- extract version from Git
-set(PROJECT_VERSION 0.0.0)
-find_program(GIT_VERSION_GEN NAMES git-version-gen
- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH)
-if(GIT_VERSION_GEN)
- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- RESULT_VARIABLE _err
- OUTPUT_VARIABLE git_version
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-if(_err EQUAL 0)
- if(git_version MATCHES
- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*")
- set(_major "${CMAKE_MATCH_1}")
- set(_minor "${CMAKE_MATCH_2}")
- set(_patch "${CMAKE_MATCH_3}")
- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999)
- elseif(git_version MATCHES
- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
- set(_major "${CMAKE_MATCH_1}")
- set(_minor "${CMAKE_MATCH_2}")
- set(_patch "${CMAKE_MATCH_3}")
- set(PROJECT_VERSION ${_major}.${_minor}.${_patch})
- elseif(git_version MATCHES
- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
- set(_major "${CMAKE_MATCH_1}")
- set(_minor "${CMAKE_MATCH_2}")
- set(PROJECT_VERSION ${_major}.${_minor})
- elseif(git_version MATCHES
- "^(0|[1-9][0-9]*)")
- set(_major "${CMAKE_MATCH_1}")
- set(PROJECT_VERSION ${_major})
- endif()
-endif()
+set(PROJECT_VERSION 2.8.3)
diff --git a/cmake/p4est_config.h.in b/cmake/p4est_config.h.in
index 72645dd..7560dcc 100644
--- a/cmake/p4est_config.h.in
+++ b/cmake/p4est_config.h.in
@@ -135,7 +135,7 @@
#define P4EST_PACKAGE_NAME "p4est"
/* Define to the full name and version of this package. */
-#define P4EST_PACKAGE_STRING "p4est 2.0.94-00da"
+#define P4EST_PACKAGE_STRING "p4est 2.8.0"
/* Define to the one symbol short name of this package. */
#define P4EST_PACKAGE_TARNAME "p4est"
@@ -144,16 +144,16 @@
#define P4EST_PACKAGE_URL ""
/* Define to the version of this package. */
-#define P4EST_PACKAGE_VERSION "2.0.94-00da"
+#define P4EST_PACKAGE_VERSION "2.8.0"
/* Version number of package */
-#define P4EST_VERSION "2.0.94-00da"
+#define P4EST_VERSION "2.8.0"
/* Package major version */
#define P4EST_VERSION_MAJOR 2
/* Package minor version */
-#define P4EST_VERSION_MINOR 0
+#define P4EST_VERSION_MINOR 8
/* Package point version */
-#define P4EST_VERSION_POINT 94-00da
+#define P4EST_VERSION_POINT 0