diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9d40a29..0edb761f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,9 +77,12 @@ add_library(format ${FMT_SOURCES})
 if (CMAKE_COMPILER_IS_GNUCXX)
   set_target_properties(format PROPERTIES COMPILE_FLAGS
     "-Wall -Wextra -Wshadow -pedantic")
+  if (CPP11_FLAG)
+    set_target_properties(format PROPERTIES COMPILE_FLAGS
+      "-Wall -Wextra -Wshadow -pedantic ${CPP11_FLAG}")
+  endif ()
 endif ()
 if (CPP11_FLAG AND FMT_EXTRA_TESTS)
-  set_target_properties(format PROPERTIES COMPILE_FLAGS ${CPP11_FLAG})
   # 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})