From b7febc98563a063a2d3a5c3567f3a5190a149d28 Mon Sep 17 00:00:00 2001 From: Magnus Bjerke Vik Date: Tue, 17 Mar 2015 10:53:49 +0100 Subject: [PATCH] Fix CMake CPP11_FLAG not being added to compile flags when FMT_EXTRA_TESTS is OFF. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 989d1a53..4a8162b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,8 +75,10 @@ if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(format PROPERTIES COMPILE_FLAGS "-Wall -Wextra -Wshadow -pedantic") endif () -if (CPP11_FLAG AND FMT_EXTRA_TESTS) +if (CPP11_FLAG) set_target_properties(format PROPERTIES COMPILE_FLAGS ${CPP11_FLAG}) +endif () +if (FMT_EXTRA_TESTS) # Test compilation with default flags. file(GLOB src RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/*.cc test/*.h) add_library(testformat STATIC ${FMT_SOURCE_FILES} ${src})