Merge b7febc9856 into a6aa789f4b

2015-03-17 13:48:53 +00:00 · 2015-03-17 13:48:53 +00:00 · b621b499ee
commit b621b499ee
parent a6aa789f4b b7febc9856
1 changed files with 3 additions and 1 deletions
--- 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})