aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2013-06-27 10:47:30 +0200
committerSpp <spp@jorge.gr>2013-06-27 10:47:30 +0200
commitd58a037512682db6480b80513162143defb3061a (patch)
treedea6345cb243a577e6e4bd7947efb97eca7ac58d
parent75f535c65e99bc6edb296cea18795a829655ef9a (diff)
Build: Set _BUILD_DIRECTIVE even if the compiler is not properly detected
-rw-r--r--cmake/platform/unix/settings.cmake3
-rw-r--r--src/server/shared/SystemConfig.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake
index a851c8acf7a..b0c0d260623 100644
--- a/cmake/platform/unix/settings.cmake
+++ b/cmake/platform/unix/settings.cmake
@@ -32,10 +32,13 @@ add_custom_target(uninstall
)
message(STATUS "UNIX: Created uninstall target")
+message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}")
if(CMAKE_C_COMPILER MATCHES "gcc")
include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
elseif(CMAKE_C_COMPILER MATCHES "icc")
include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake)
elseif(CMAKE_C_COMPILER MATCHES "clang")
include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
+else()
+add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
endif()
diff --git a/src/server/shared/SystemConfig.h b/src/server/shared/SystemConfig.h
index a6076273522..c3e54763ff0 100644
--- a/src/server/shared/SystemConfig.h
+++ b/src/server/shared/SystemConfig.h
@@ -34,7 +34,7 @@
#if PLATFORM == PLATFORM_WINDOWS
# ifdef _WIN64
-# define _FULLVERSION _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win64, "_BUILD_DIRECTIVE ")"
+# define _FULLVERSION _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win64, " _BUILD_DIRECTIVE ")"
# else
# define _FULLVERSION _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win32, " _BUILD_DIRECTIVE ")"
# endif