From 3f6f645bbb75d527cffbddbb008a31cee38919f3 Mon Sep 17 00:00:00 2001 From: jcotela Date: Thu, 3 Aug 2017 17:35:55 +0200 Subject: [PATCH] Adding build mode strings. --- CMakeLists.txt | 18 +++++++++++++----- kratos_version.h.in | 7 +++++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 695796505338..623a0e5a4c68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,13 +10,13 @@ set (KratosMultiphysics_PATCH_VERSION 0) SET( BASIC_DEBUG_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}") SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "Flags used by the C++ compiler during Release builds." FORCE) -SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DKRATOS_BUILD_SUFFIX=-RelWithDebInfo" +SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" CACHE STRING "Flags used by the C++ compiler during RelWithDebInfo builds." FORCE) -SET( CMAKE_CXX_FLAGS_FASTDEBUG "${BASIC_DEBUG_FLAGS} -DNDEBUG -DKRATOS_DEBUG -DKRATOS_BUILD_SUFFIX=-FastDebug" +SET( CMAKE_CXX_FLAGS_FASTDEBUG "${BASIC_DEBUG_FLAGS} -DNDEBUG -DKRATOS_DEBUG" CACHE STRING "Flags used by the C++ compiler during FastDebug builds." FORCE) -SET( CMAKE_CXX_FLAGS_DEBUG "${BASIC_DEBUG_FLAGS} -DNDEBUG -DKRATOS_DEBUG -DKRATOS_BUILD_SUFFIX=-Debug" +SET( CMAKE_CXX_FLAGS_DEBUG "${BASIC_DEBUG_FLAGS} -DNDEBUG -DKRATOS_DEBUG" CACHE STRING "Flags used by the C++ compiler during Debug builds." FORCE) -SET( CMAKE_CXX_FLAGS_FULLDEBUG "${BASIC_DEBUG_FLAGS} -DKRATOS_DEBUG -DKRATOS_BUILD_SUFFIX=-FullDebug" +SET( CMAKE_CXX_FLAGS_FULLDEBUG "${BASIC_DEBUG_FLAGS} -DKRATOS_DEBUG" CACHE STRING "Flags used by the C++ compiler during FullDebug builds." FORCE) message("BASIC_DEBUG_FLAGS ${BASIC_DEBUG_FLAGS}") @@ -25,7 +25,7 @@ message("RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") message("FASTDEBUG: ${CMAKE_CXX_FLAGS_FASTDEBUG}") message("DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}") message("FULLDEBUG: ${CMAKE_CXX_FLAGS_FULLDEBUG}") - +message("CMAKE_CONFIGURATION_TYPES: ${CMAKE_CONFIGURATION_TYPES}") # Get subversion data. This is done automagically by the cmakes include (GenerateExportHeader) @@ -42,6 +42,14 @@ else(GIT_FOUND) set (KratosMultiphysics_SHA1_NUMBER 0) endif(GIT_FOUND) +set (KratosMultiphysics_BUILD_TYPE ${CMAKE_BUILD_TYPE}) +string( TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_BUILD_TYPE) +if( UPPERCASE_BUILD_TYPE MATCHES RELEASE ) + set (KratosMultiphysics_BUILD_SUFFIX "") +else( UPPERCASE_BUILD_TYPE MATCHES RELEASE ) + set (KratosMultiphysics_BUILD_SUFFIX "-${CMAKE_BUILD_TYPE}" ) +endif( UPPERCASE_BUILD_TYPE MATCHES RELEASE ) + configure_file( "${PROJECT_SOURCE_DIR}/kratos_version.h.in" "${PROJECT_SOURCE_DIR}/kratos/includes/kratos_version.h" diff --git a/kratos_version.h.in b/kratos_version.h.in index 08902cad6d2b..05c9b3de1d94 100644 --- a/kratos_version.h.in +++ b/kratos_version.h.in @@ -3,7 +3,10 @@ #define KRATOS_MINOR_VERSION @KratosMultiphysics_MINOR_VERSION@ #define KRATOS_PATCH_VERSION @KratosMultiphysics_PATCH_VERSION@ -//svn version at configure time +//git revision at configure time #define KRATOS_SHA1_NUMBER @KratosMultiphysics_SHA1_NUMBER@ -#define KRATOS_VERSION "@KratosMultiphysics_MAJOR_VERSION@.@KratosMultiphysics_MINOR_VERSION@.@KratosMultiphysics_PATCH_VERSION@-@KratosMultiphysics_SHA1_NUMBER@" +//cmake build type +#define KRATOS_BUILD_TYPE @KratosMultiphysics_BUILD_TYPE@ + +#define KRATOS_VERSION "@KratosMultiphysics_MAJOR_VERSION@.@KratosMultiphysics_MINOR_VERSION@.@KratosMultiphysics_PATCH_VERSION@-@KratosMultiphysics_SHA1_NUMBER@@KratosMultiphysics_BUILD_SUFFIX@"