From 79adad5e33618dad928f9386037d4d097c6b6e77 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 13 Feb 2015 14:04:13 +0800 Subject: [PATCH] Enable C++11 when building main library too --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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})