Skip to content

Commit 375f452

Browse files
committed
Set TRACY_VERSION_STRING directly in version.cmake.
1 parent 776b08f commit 375f452

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ cmake_minimum_required(VERSION 3.10)
33
# Run version helper script
44
include(cmake/version.cmake)
55

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-
116
project(Tracy LANGUAGES CXX VERSION ${TRACY_VERSION_STRING})
127

138
if(${BUILD_SHARED_LIBS})

cmake/version.cmake

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ string(REGEX MATCH "Major = ([0-9]+)" _ ${version})
1111
# This works do to the above () subexpression selection. See
1212
# https://cmake.org/cmake/help/latest/command/string.html#regex-match for more
1313
# details
14-
set(major ${CMAKE_MATCH_1})
14+
set(TRACY_VERSION_MAJOR ${CMAKE_MATCH_1})
1515

1616
string(REGEX MATCH "Minor = ([0-9]+)" _ ${version})
17-
set(minor ${CMAKE_MATCH_1})
17+
set(TRACY_VERSION_MINOR ${CMAKE_MATCH_1})
1818

1919
string(REGEX MATCH "Patch = ([0-9]+)" _ ${version})
20-
set(patch ${CMAKE_MATCH_1})
20+
set(TRACY_VERSION_PATCH ${CMAKE_MATCH_1})
2121

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}")

profiler/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ option(NO_STATISTICS "Disable calculation of statistics" OFF)
88

99
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake)
1010

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-
1611
set(CMAKE_CXX_STANDARD 20)
1712

1813
project(

0 commit comments

Comments
 (0)