Don't treat CMAKE_CXX_FLAGS as a list

CMakeLists.txt

@@ -27,9 +27,9 @@ include(CXXFeatureCheck)
 check_cxx_compiler_flag(-std=c++11 HAVE_FLAG_CXX_11)
 check_cxx_compiler_flag(-std=c++0x HAVE_FLAG_CXX_0X)
 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)
-  list(APPEND CMAKE_CXX_FLAGS -std=c++0x)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 endif()
 
 # Turn compiler warnings up to 11

test/CMakeLists.txt

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