CMakeLists changes to properly deal with CMAKE_CXX_FLAGS etc.

deanberris · deanberris · commit 1b503081964e · 2013-07-03T21:13:45.000+10:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,7 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
   INCLUDE(CheckCXXCompilerFlag)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   if (HAVE_STD11)
-    list(APPEND CMAKE_CXX_FLAGS "-std=c++11 -Wall")
+    set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11 -Wall")
   else()
     message(FATAL_ERROR "No advanced standard C++ support (-std=c++11 not defined).")
   endif()
@@ -58,10 +58,10 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   if (HAVE_STD11)
     if (CPP-NETLIB_DISABLE_LIBCXX)
-      list(APPEND CMAKE_CXX_FLAGS "-std=c++11 -Wall")
-      list(APPEND CMAKE_CXX_LINK_FLAGS "-std=c++11")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
     else()
-      list(APPEND CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ -Wall")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall")
+      set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -stdlib=libc++")
     endif()
   else()
     message(FATAL_ERROR "No C++11 support for Clang version. Please upgrade Clang to a version supporting C++11.")
