From 2883163787b56c0b7236c37f86adf8d7ba571e61 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Mon, 9 Dec 2013 17:47:07 -0800
Subject: [PATCH] Test compilation with default flags.

---
 CMakeLists.txt | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 271cdc39..e8963c91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,15 +12,17 @@ project(FORMAT)
 
 include(CheckCXXCompilerFlag)
 check_cxx_compiler_flag(-std=c++11 HAVE_STD_CPP11_FLAG)
-if (HAVE_STD_CPP11_FLAG)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-endif ()
 
 add_library(format format.cc)
 if (CMAKE_COMPILER_IS_GNUCXX)
   set_target_properties(format PROPERTIES COMPILE_FLAGS
     "-Wall -Wextra -pedantic")
 endif ()
+if (HAVE_STD_CPP11_FLAG)
+  set_target_properties(format PROPERTIES COMPILE_FLAGS "-std=c++11")
+  # Test compilation with default flags.
+  add_library(testformat format.cc)
+endif ()
 
 add_subdirectory(doc)
 
@@ -47,6 +49,9 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt)
       "-Wall -Wextra -pedantic -Wno-long-long -Wno-variadic-macros")
   endif ()
   add_test(format_test format_test)
+  if (HAVE_STD_CPP11_FLAG)
+    set_target_properties(format_test PROPERTIES COMPILE_FLAGS "-std=c++11")
+  endif ()
 endif ()
 
 find_package(Boost)
@@ -61,6 +66,9 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/format-benchmark/tinyformat_test.cpp)
   target_link_libraries(tinyformat_speed_test format)
   set_target_properties(tinyformat_speed_test PROPERTIES COMPILE_DEFINITIONS
     "SPEED_TEST;HAVE_FORMAT;_SCL_SECURE_NO_WARNINGS")
+  if (HAVE_STD_CPP11_FLAG)
+    set_target_properties(tinyformat_speed_test PROPERTIES COMPILE_FLAGS "-std=c++11")
+  endif ()
 
   add_custom_target(speed_test
     COMMAND @echo running speed tests...