[Lldb-commits] [lldb] r204311 - cmake: fix build with CompilerRT

[Saleem Abdulrasool]

Author: compnerd
Date: Thu Mar 20 01:08:41 2014
New Revision: 204311

URL: http://llvm.org/viewvc/llvm-project?rev=204311&view=rev
Log:
cmake: fix build with CompilerRT

A redefinition of append_if in CompilerRTUtils causes the append_if to fail.
Manually append the values to the flags.

Thanks to Kuba Ober for pointing this out!

Modified:
    lldb/trunk/CMakeLists.txt

Modified: lldb/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=204311&r1=204310&r2=204311&view=diff
==============================================================================
--- lldb/trunk/CMakeLists.txt (original)
+++ lldb/trunk/CMakeLists.txt Thu Mar 20 01:08:41 2014
@@ -129,14 +129,16 @@ endif()
 # Disable GCC warnings
 check_cxx_compiler_flag("-Wno-deprecated-declarations"
                         CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)
-append_if(CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS
-          "-Wno-deprecated-declarations" CMAKE_CXX_FLAGS)
+if (CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+endif ()
 
 # Disable Clang warnings
 check_cxx_compiler_flag("-Wno-deprecated-register"
                         CXX_SUPPORTS_NO_DEPRECATED_REGISTER)
-append_if(CXX_SUPPORTS_NO_DEPRECATED_REGISTER
-          "-Wno-deprecated-register" CMAKE_CXX_FLAGS)
+if (CXX_SUPPORTS_NO_DEPRECATED_REGISTER)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register")
+endif ()
 
 # Disable MSVC warnings
 if( MSVC )