diff options
author | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-01-30 22:55:25 +0000 |
---|---|---|
committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-01-30 22:55:25 +0000 |
commit | 8062fa2d539aa471b72a8ac664bd75588f8d067d (patch) | |
tree | 39752f12f82aa8368b2331835de96747a1d82d7d /cmake/modules/AddLLVM.cmake | |
parent | 3bbf29b84f3e8aea0b3a5d879093b49be13e8af1 (diff) | |
download | llvm-8062fa2d539aa471b72a8ac664bd75588f8d067d.tar.gz llvm-8062fa2d539aa471b72a8ac664bd75588f8d067d.tar.bz2 llvm-8062fa2d539aa471b72a8ac664bd75588f8d067d.tar.xz |
[CMake] llvm_update_compile_flags: Honor LLVM_COMPILE_FLAGS.
I accidentally mis-dropped LLVM_COMPILE_FLAGS in r200301. Sorry for that.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200499 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/modules/AddLLVM.cmake')
-rw-r--r-- | cmake/modules/AddLLVM.cmake | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 19a68387fe..301aeea80f 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -12,22 +12,27 @@ function(llvm_update_compile_flags name) set(LLVM_REQUIRES_RTTI ON) else() if(LLVM_COMPILER_IS_GCC_COMPATIBLE) - set(target_compile_flags "${target_compile_flags} -fno-exceptions") + list(APPEND LLVM_COMPILE_FLAGS "-fno-exceptions") elseif(MSVC) list(APPEND LLVM_COMPILE_DEFINITIONS _HAS_EXCEPTIONS=0) - set(target_compile_flags "${target_compile_flags} /EHs-c-") + list(APPEND LLVM_COMPILE_FLAGS "/EHs-c-") endif() endif() if(NOT LLVM_REQUIRES_RTTI) list(APPEND LLVM_COMPILE_DEFINITIONS GTEST_HAS_RTTI=0) if (LLVM_COMPILER_IS_GCC_COMPATIBLE) - set(target_compile_flags "${target_compile_flags} -fno-rtti") + list(APPEND LLVM_COMPILE_FLAGS "-fno-rtti") elseif (MSVC) - set(target_compile_flags "${target_compile_flags} /GR-") + list(APPEND LLVM_COMPILE_FLAGS "/GR-") endif () endif() + # Assume that; + # - LLVM_COMPILE_FLAGS is list. + # - PROPERTY COMPILE_FLAGS is string. + string(REPLACE ";" " " target_compile_flags "${LLVM_COMPILE_FLAGS}") + if(update_src_props) foreach(fn ${sources}) get_filename_component(suf ${fn} EXT) @@ -399,7 +404,7 @@ function(add_unittest test_suite test_name) endif () if (SUPPORTS_NO_VARIADIC_MACROS_FLAG) - set(LLVM_COMPILE_FLAGS "-Wno-variadic-macros") + list(APPEND LLVM_COMPILE_FLAGS "-Wno-variadic-macros") endif () set(LLVM_REQUIRES_RTTI OFF) |