Skip to content

Commit 5d61d34

Browse files
committed
[brief] Changes the way the versioning is done.
[detailed] - Use the built-in CMake PROJECT_VERSION variables instead of keeping separate ones. That way we only have to update one thing instead of updating several.
1 parent b5c47de commit 5d61d34

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,6 @@ endif()
1010

1111
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1212

13-
# Define version variables.
14-
set(ZEUS_VERSION_MAJOR "1")
15-
set(ZEUS_VERSION_MINOR "0")
16-
set(ZEUS_VERSION_PATCH "1")
17-
set(ZEUS_VERSION_EXTRA "")
18-
set(ZEUS_VERSION "${ZEUS_VERSION_MAJOR}.${ZEUS_VERSION_MINOR}")
19-
set(ZEUS_VERSION_FULL
20-
"${ZEUS_VERSION}.${ZEUS_VERSION_PATCH}${ZEUS_VERSION_EXTRA}")
21-
2213
#================================
2314
# Option variables.
2415
#================================

include/zeus/zeus.hpp.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
#include <string_view>
44

5-
#define ZEUS_VERSION_MAJOR @ZEUS_VERSION_MAJOR@
6-
#define ZEUS_VERSION_MINOR @ZEUS_VERSION_MINOR@
7-
#define ZEUS_VERSION_PATCH @ZEUS_VERSION_PATCH@
5+
#define ZEUS_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
6+
#define ZEUS_VERSION_MINOR @PROJECT_VERSION_MINOR@
7+
#define ZEUS_VERSION_PATCH @PROJECT_VERSION_PATCH@
88

99
namespace zeus
1010
{
11-
static constexpr auto zeus_version_major{@ZEUS_VERSION_MAJOR@};
12-
static constexpr auto zeus_version_minor{@ZEUS_VERSION_MINOR@};
13-
static constexpr auto zeus_version_patch{@ZEUS_VERSION_PATCH@};
11+
static constexpr auto zeus_version_major{@PROJECT_VERSION_MAJOR@};
12+
static constexpr auto zeus_version_minor{@PROJECT_VERSION_MINOR@};
13+
static constexpr auto zeus_version_patch{@PROJECT_VERSION_PATCH@};
1414

15-
static constexpr std::string_view zeus_version_string{"@ZEUS_VERSION_MAJOR@.@ZEUS_VERSION_MINOR@.@ZEUS_VERSION_PATCH@"};
15+
static constexpr std::string_view zeus_version_string{"@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@"};
1616
}

0 commit comments

Comments
 (0)