Merge remote-tracking branch 'upstream/master' into threading_rewrite

2016-08-19 12:15:22 +02:00 · 2016-08-19 12:15:22 +02:00 · 55c47f8a35
commit 55c47f8a35
parent 54ad9aa30d cdda5249bd
1 changed files with 1 additions and 1 deletions
--- a/modules/acore/cmake/compiler/clang/settings.cmake
+++ b/modules/acore/cmake/compiler/clang/settings.cmake
@ -1,5 +1,5 @@
 # Set build-directive (used in core to tell which buildtype we used)
-add_definitions(-D_BUILD_DIRECTIVE='"$(CONFIGURATION)"')
+add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')

 if(WITH_WARNINGS)
  set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors -Wno-mismatched-tags")