github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-03-27 04:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't treat CMAKE_CXX_FLAGS as a list

Browse Source
This commit is contained in:
Eric Fiselier 2015-03-18 17:05:53 -04:00
parent daa8a67aa5
commit d40cb97713
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -27,9 +27,9 @@ include(CXXFeatureCheck)
check_cxx_compiler_flag(-std=c++11 HAVE_FLAG_CXX_11) check_cxx_compiler_flag(-std=c++11 HAVE_FLAG_CXX_11)
check_cxx_compiler_flag(-std=c++0x HAVE_FLAG_CXX_0X) check_cxx_compiler_flag(-std=c++0x HAVE_FLAG_CXX_0X)
if (HAVE_FLAG_CXX_11) if (HAVE_FLAG_CXX_11)
list(APPEND CMAKE_CXX_FLAGS -std=c++11) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif (HAVE_FLAG_CXX_0X) elseif (HAVE_FLAG_CXX_0X)
list(APPEND CMAKE_CXX_FLAGS -std=c++0x) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
endif() endif()
# Turn compiler warnings up to 11 # Turn compiler warnings up to 11

1
test/CMakeLists.txt
View File

@ -3,6 +3,7 @@
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
set(CXX03_FLAGS "${CMAKE_CXX_FLAGS}") set(CXX03_FLAGS "${CMAKE_CXX_FLAGS}")
separate_arguments(CXX03_FLAGS)
list(REMOVE_ITEM CXX03_FLAGS -std=c++11 -std=c++0x) list(REMOVE_ITEM CXX03_FLAGS -std=c++11 -std=c++0x)
list(APPEND CXX03_FLAGS -std=c++03) list(APPEND CXX03_FLAGS -std=c++03)
string(REPLACE ";" " " CXX03_FLAGS "${CXX03_FLAGS}") string(REPLACE ";" " " CXX03_FLAGS "${CXX03_FLAGS}")