File tree Expand file tree Collapse file tree 3 files changed +6
-14
lines changed Expand file tree Collapse file tree 3 files changed +6
-14
lines changed Original file line number Diff line number Diff line change @@ -3,11 +3,6 @@ cmake_minimum_required(VERSION 3.10)
3
3
# Run version helper script
4
4
include (cmake/version.cmake )
5
5
6
- set (TRACY_VERSION_MAJOR ${major} )
7
- set (TRACY_VERSION_MINOR ${minor} )
8
- set (TRACY_VERSION_PATCH ${patch} )
9
- set (TRACY_VERSION_STRING "${TRACY_VERSION_MAJOR} .${TRACY_VERSION_MINOR} .${TRACY_VERSION_PATCH} " )
10
-
11
6
project (Tracy LANGUAGES CXX VERSION ${TRACY_VERSION_STRING} )
12
7
13
8
if (${BUILD_SHARED_LIBS} )
Original file line number Diff line number Diff line change @@ -11,12 +11,14 @@ string(REGEX MATCH "Major = ([0-9]+)" _ ${version})
11
11
# This works do to the above () subexpression selection. See
12
12
# https://cmake.org/cmake/help/latest/command/string.html#regex-match for more
13
13
# details
14
- set (major ${CMAKE_MATCH_1} )
14
+ set (TRACY_VERSION_MAJOR ${CMAKE_MATCH_1} )
15
15
16
16
string (REGEX MATCH "Minor = ([0-9]+)" _ ${version} )
17
- set (minor ${CMAKE_MATCH_1} )
17
+ set (TRACY_VERSION_MINOR ${CMAKE_MATCH_1} )
18
18
19
19
string (REGEX MATCH "Patch = ([0-9]+)" _ ${version} )
20
- set (patch ${CMAKE_MATCH_1} )
20
+ set (TRACY_VERSION_PATCH ${CMAKE_MATCH_1} )
21
21
22
- message ("VERSION ${major} .${minor} .${patch} " )
22
+ set (TRACY_VERSION_STRING "${TRACY_VERSION_MAJOR} .${TRACY_VERSION_MINOR} .${TRACY_VERSION_PATCH} " )
23
+
24
+ message ("VERSION ${TRACY_VERSION_STRING} " )
Original file line number Diff line number Diff line change @@ -8,11 +8,6 @@ option(NO_STATISTICS "Disable calculation of statistics" OFF)
8
8
9
9
include (${CMAKE_CURRENT_LIST_DIR} /../cmake/version.cmake )
10
10
11
- set (TRACY_VERSION_MAJOR ${major} )
12
- set (TRACY_VERSION_MINOR ${minor} )
13
- set (TRACY_VERSION_PATCH ${patch} )
14
- set (TRACY_VERSION_STRING "${TRACY_VERSION_MAJOR} .${TRACY_VERSION_MINOR} .${TRACY_VERSION_PATCH} " )
15
-
16
11
set (CMAKE_CXX_STANDARD 20 )
17
12
18
13
project (
You can’t perform that action at this time.
0 commit comments