blob: b24f265f496b9e62b811f4cd02315b21afd32e07 (
plain)
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
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
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
|
GitWeb