From 2915a84dc139a914d07adbf2f575f8d8f0b3dac4 Mon Sep 17 00:00:00 2001
From: Tomas Pecka <tomas.pecka@fit.cvut.cz>
Date: Thu, 21 Nov 2019 10:19:02 +0100
Subject: [PATCH] CMake: case insensitive BUILD_TYPE
---
CMake/Modules/CompilerFlags.cmake | 10 +++++-----
CMake/Modules/versioning.cmake | 10 +++++-----
CMake/templates/CMakeLists_root.txt | 9 +++++----
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/CMake/Modules/CompilerFlags.cmake b/CMake/Modules/CompilerFlags.cmake
index b1d6a68d0a..63ec991acb 100644
--- a/CMake/Modules/CompilerFlags.cmake
+++ b/CMake/Modules/CompilerFlags.cmake
@@ -31,15 +31,15 @@ if(BACKTRACE_EXISTS)
add_definitions(-DBACKTRACE)
endif()
-if(BUILD_TYPE STREQUAL "Debug")
+if(BUILD_TYPE STREQUAL "debug")
add_definitions(-DREL_DEBUG)
-elseif(BUILD_TYPE STREQUAL "Release")
+elseif(BUILD_TYPE STREQUAL "release")
add_definitions(-DREL_RELEASE)
-elseif(BUILD_TYPE STREQUAL "Snapshot")
+elseif(BUILD_TYPE STREQUAL "snapshot")
add_definitions(-DREL_SNAPSHOT)
endif()
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+if (CMAKE_BUILD_TYPE STREQUAL "debug")
add_definitions(-DDEBUG)
CHECK_CXX_COMPILER_FLAG("-Og" COMPILER_HAS_OG)
@@ -49,7 +49,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_compile_options(-O0)
endif()
-elseif (CMAKE_BUILD_TYPE STREQUAL "Release")
+elseif (CMAKE_BUILD_TYPE STREQUAL "release")
remove_definitions(-DNDEBUG)
add_definitions(-DRELEASE)
add_compile_options(-O3)
diff --git a/CMake/Modules/versioning.cmake b/CMake/Modules/versioning.cmake
index 90d6f50503..e2e5124046 100644
--- a/CMake/Modules/versioning.cmake
+++ b/CMake/Modules/versioning.cmake
@@ -1,7 +1,7 @@
#################
# ALIB Versioning
-message("[Versioning] Current version is ${PROJECT_VERSION}")
+message("[Versioning] Current stable version is ${PROJECT_VERSION}")
include(git)
@@ -19,7 +19,7 @@ if(DEFINED VERSION)
endif()
-if(BUILD_TYPE STREQUAL "Snapshot")
+if(BUILD_TYPE STREQUAL "snapshot")
if(DEFINED ALIB_SNAPSHOT_VERSION)
message("[Versioning] Snapshot version: ${ALIB_SNAPSHOT_VERSION}")
else()
@@ -28,11 +28,11 @@ if(BUILD_TYPE STREQUAL "Snapshot")
endif()
endif()
-if(BUILD_TYPE STREQUAL "Debug")
+if(BUILD_TYPE STREQUAL "debug")
set(ALIB_VERSION_INFO "${PROJECT_VERSION} | Debug build @ ${ALIB_GIT_BRANCH} ${ALIB_GIT_DESCRIBE}" )
-elseif(BUILD_TYPE STREQUAL "Release")
+elseif(BUILD_TYPE STREQUAL "release")
set(ALIB_VERSION_INFO "${PROJECT_VERSION}")
-elseif(BUILD_TYPE STREQUAL "Snapshot")
+elseif(BUILD_TYPE STREQUAL "snapshot")
set(ALIB_VERSION_INFO "${ALIB_SNAPSHOT_VERSION}")
endif()
diff --git a/CMake/templates/CMakeLists_root.txt b/CMake/templates/CMakeLists_root.txt
index 4d912294ad..81a34a9f3d 100644
--- a/CMake/templates/CMakeLists_root.txt
+++ b/CMake/templates/CMakeLists_root.txt
@@ -23,13 +23,14 @@ endif ()
if (NOT BUILD_TYPE)
set(BUILD_TYPE Debug)
endif()
-if(NOT BUILD_TYPE MATCHES "(Release|Snapshot|Debug)")
+string(TOLOWER ${{BUILD_TYPE}} BUILD_TYPE)
+if(NOT BUILD_TYPE MATCHES "(release|snapshot|debug)")
message(FATAL_ERROR "Unsupported build type (${{BUILD_TYPE}}). Valid values: Release | Snapshot | Debug ")
-elseif(BUILD_TYPE MATCHES "Release")
+elseif(BUILD_TYPE MATCHES "release")
set(CMAKE_BUILD_TYPE Release)
-elseif(BUILD_TYPE MATCHES "Snapshot")
+elseif(BUILD_TYPE MATCHES "snapshot")
set(CMAKE_BUILD_TYPE Release)
-elseif(BUILD_TYPE MATCHES "Debug")
+elseif(BUILD_TYPE MATCHES "debug")
set(CMAKE_BUILD_TYPE Debug)
endif()
--
GitLab