diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2011-01-11 12:31:34 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2011-01-11 12:31:34 +0000 |
| commit | 77c4f7012312e4da273fe50fb04bd8a0109dc38f (patch) | |
| tree | 23703ef89a1726fab175bbd54e0674be8da4225a /llvm/cmake/modules/LLVMProcessSources.cmake | |
| parent | bf711d90ed8480cbe56d048274d92866f2232c92 (diff) | |
| download | bcm5719-llvm-77c4f7012312e4da273fe50fb04bd8a0109dc38f.tar.gz bcm5719-llvm-77c4f7012312e4da273fe50fb04bd8a0109dc38f.zip | |
Made llvm_replace_compiler_option more robust. Use it on
llvm_process_sources.
llvm-svn: 123232
Diffstat (limited to 'llvm/cmake/modules/LLVMProcessSources.cmake')
| -rw-r--r-- | llvm/cmake/modules/LLVMProcessSources.cmake | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/llvm/cmake/modules/LLVMProcessSources.cmake b/llvm/cmake/modules/LLVMProcessSources.cmake index 98b61296db4..270292ad3b8 100644 --- a/llvm/cmake/modules/LLVMProcessSources.cmake +++ b/llvm/cmake/modules/LLVMProcessSources.cmake @@ -1,15 +1,22 @@ include(AddFileDependencies) -macro(llvm_replace_compiler_option var old new) +function(llvm_replace_compiler_option var old new) # Replaces a compiler option or switch `old' in `var' by `new'. # If `old' is not in `var', appends `new' to `var'. # Example: llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2") + # If the option already is on the variable, don't add it: + if( "${${var}}" MATCHES "(^| )${new}($| )" ) + set(n "") + else() + set(n "${new}") + endif() if( "${${var}}" MATCHES "(^| )${old}($| )" ) - string( REGEX REPLACE "(^| )${old}($| )" " ${new} " ${var} "${${var}}" ) + string( REGEX REPLACE "(^| )${old}($| )" " ${n} " ${var} "${${var}}" ) else() - set( ${var} "${${var}} ${new}" ) + set( ${var} "${${var}} ${n}" ) endif() -endmacro(llvm_replace_compiler_option) + set( ${var} "${${var}}" PARENT_SCOPE ) +endfunction(llvm_replace_compiler_option) macro(add_td_sources srcs) file(GLOB tds *.td) @@ -52,15 +59,15 @@ function(llvm_process_sources OUT_VAR) if( CMAKE_COMPILER_IS_GNUCXX ) add_definitions( -fno-exceptions ) elseif( MSVC ) - string( REGEX REPLACE "[ ^]/EHsc ?" " /EHs-c- " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) + llvm_replace_compiler_option(CMAKE_CXX_FLAGS "/EHsc" "/EHs-c-") add_definitions( /D_HAS_EXCEPTIONS=0 ) endif() endif() if( NOT LLVM_REQUIRES_RTTI ) if( CMAKE_COMPILER_IS_GNUCXX ) - add_definitions( -fno-rtti ) + llvm_replace_compiler_option(CMAKE_CXX_FLAGS "-frtti" "-fno-rtti") elseif( MSVC ) - string( REGEX REPLACE "[ ^]/GR ?" " /GR- " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) + llvm_replace_compiler_option(CMAKE_CXX_FLAGS "/GR" "/GR-") endif() endif() |
