Adding build mode strings.

adrigzr · Aug 3, 2017 · 3f6f645 · 3f6f645
1 parent f56da31
commit 3f6f645
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git 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
@@ -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@"