External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CMake CPP11_FLAG not being added to compile flags when FMT_EXTRA_TESTS is OFF.

Browse Source
This commit is contained in:
Magnus Bjerke Vik 2015-03-17 10:53:49 +01:00
parent 0b097da31e
commit b7febc9856
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -75,8 +75,10 @@ if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(format PROPERTIES COMPILE_FLAGS set_target_properties(format PROPERTIES COMPILE_FLAGS
"-Wall -Wextra -Wshadow -pedantic") "-Wall -Wextra -Wshadow -pedantic")
endif () endif ()
if (CPP11_FLAG AND FMT_EXTRA_TESTS) if (CPP11_FLAG)
set_target_properties(format PROPERTIES COMPILE_FLAGS ${CPP11_FLAG}) set_target_properties(format PROPERTIES COMPILE_FLAGS ${CPP11_FLAG})
endif ()
if (FMT_EXTRA_TESTS)
# Test compilation with default flags. # Test compilation with default flags.
file(GLOB src RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/*.cc test/*.h) file(GLOB src RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/*.cc test/*.h)
add_library(testformat STATIC ${FMT_SOURCE_FILES} ${src}) add_library(testformat STATIC ${FMT_SOURCE_FILES} ${src})