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

This commit is contained in:
ShinDarth
2016-08-19 12:15:22 +02:00

View File

@@ -1,5 +1,5 @@
# Set build-directive (used in core to tell which buildtype we used) # 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) if(WITH_WARNINGS)
set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors -Wno-mismatched-tags") set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors -Wno-mismatched-tags")