From 19f833506aebcba93c5edc02129c3f7fb94dcb32 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Wed, 5 Jun 2019 01:08:42 +0200 Subject: [PATCH] cmake: unify radiant variable names --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49d021dc..bd5dab6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,10 +40,10 @@ endif () #----------------------------------------------------------------------- # CMake 3.0+ would allow this in project() -set(NetRadiant_VERSION_MAJOR 1) -set(NetRadiant_VERSION_MINOR 5) -set(NetRadiant_VERSION_PATCH 0) -set(NetRadiant_VERSION "${NetRadiant_VERSION_MAJOR}.${NetRadiant_VERSION_MINOR}.${NetRadiant_VERSION_PATCH}") +set(RADIANT_VERSION_MAJOR 1) +set(RADIANT_VERSION_MINOR 5) +set(RADIANT_VERSION_PATCH 0) +set(RADIANT_VERSION "${RADIANT_VERSION_MAJOR}.${RADIANT_VERSION_MINOR}.${RADIANT_VERSION_PATCH}") set(RADIANT_ABOUTMSG "Custom build" CACHE STRING "About message") @@ -56,7 +56,7 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) -set(RADIANT_VERSION_STRING "${NetRadiant_VERSION}n") +set(RADIANT_VERSION_STRING "${RADIANT_VERSION}n") if (GIT_VERSION) set(RADIANT_VERSION_STRING "${RADIANT_VERSION_STRING}-git-${GIT_VERSION}") @@ -141,10 +141,10 @@ endif () #----------------------------------------------------------------------- if (BUILD_BINARIES) - add_definitions(-DRADIANT_VERSION="${NetRadiant_VERSION}") - add_definitions(-DRADIANT_MAJOR_VERSION="${NetRadiant_VERSION_MAJOR}") - add_definitions(-DRADIANT_MINOR_VERSION="${NetRadiant_VERSION_MINOR}") - add_definitions(-DRADIANT_PATCH_VERSION="${NetRadiant_VERSION_PATCH}") + add_definitions(-DRADIANT_VERSION="${RADIANT_VERSION}") + add_definitions(-DRADIANT_MAJOR_VERSION="${RADIANT_VERSION_MAJOR}") + add_definitions(-DRADIANT_MINOR_VERSION="${RADIANT_VERSION_MINOR}") + add_definitions(-DRADIANT_PATCH_VERSION="${RADIANT_VERSION_PATCH}") add_definitions(-DRADIANT_ABOUTMSG="${RADIANT_ABOUTMSG}") -- 2.39.2