From 375f4526dfc2d3c93680689b752da47b0eaeccc6 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 17 Mar 2024 13:19:06 +0100 Subject: [PATCH] Set TRACY_VERSION_STRING directly in version.cmake. --- CMakeLists.txt | 5 ----- cmake/version.cmake | 10 ++++++---- profiler/CMakeLists.txt | 5 ----- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2054dc31..380ba0be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,11 +3,6 @@ cmake_minimum_required(VERSION 3.10) # Run version helper script include(cmake/version.cmake) -set(TRACY_VERSION_MAJOR ${major}) -set(TRACY_VERSION_MINOR ${minor}) -set(TRACY_VERSION_PATCH ${patch}) -set(TRACY_VERSION_STRING "${TRACY_VERSION_MAJOR}.${TRACY_VERSION_MINOR}.${TRACY_VERSION_PATCH}") - project(Tracy LANGUAGES CXX VERSION ${TRACY_VERSION_STRING}) if(${BUILD_SHARED_LIBS}) diff --git a/cmake/version.cmake b/cmake/version.cmake index 97f3aa73..03813b44 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -11,12 +11,14 @@ string(REGEX MATCH "Major = ([0-9]+)" _ ${version}) # This works do to the above () subexpression selection. See # https://cmake.org/cmake/help/latest/command/string.html#regex-match for more # details -set(major ${CMAKE_MATCH_1}) +set(TRACY_VERSION_MAJOR ${CMAKE_MATCH_1}) string(REGEX MATCH "Minor = ([0-9]+)" _ ${version}) -set(minor ${CMAKE_MATCH_1}) +set(TRACY_VERSION_MINOR ${CMAKE_MATCH_1}) string(REGEX MATCH "Patch = ([0-9]+)" _ ${version}) -set(patch ${CMAKE_MATCH_1}) +set(TRACY_VERSION_PATCH ${CMAKE_MATCH_1}) -message("VERSION ${major}.${minor}.${patch}") +set(TRACY_VERSION_STRING "${TRACY_VERSION_MAJOR}.${TRACY_VERSION_MINOR}.${TRACY_VERSION_PATCH}") + +message("VERSION ${TRACY_VERSION_STRING}") diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index 58a99ab0..6ab17c65 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -8,11 +8,6 @@ option(NO_STATISTICS "Disable calculation of statistics" OFF) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake) -set(TRACY_VERSION_MAJOR ${major}) -set(TRACY_VERSION_MINOR ${minor}) -set(TRACY_VERSION_PATCH ${patch}) -set(TRACY_VERSION_STRING "${TRACY_VERSION_MAJOR}.${TRACY_VERSION_MINOR}.${TRACY_VERSION_PATCH}") - set(CMAKE_CXX_STANDARD 20) project(