replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made llvm_replace_compiler_option more robust. Use it on 

llvm_process_sources.

llvm-svn: 123232
This commit is contained in:
Oscar Fuentes 2011-01-11 12:31:34 +00:00
parent bf711d90ed
commit 77c4f70123
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
llvm/cmake/modules/LLVMProcessSources.cmake
View File

@ -1,15 +1,22 @@
include(AddFileDependencies) 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'. # Replaces a compiler option or switch `old' in `var' by `new'.
# If `old' is not in `var', appends `new' to `var'. # If `old' is not in `var', appends `new' to `var'.
# Example: llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2") # Example: llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2")
if( "${${var}}" MATCHES "(^| )${old}($| )" ) # If the option already is on the variable, don't add it:
string( REGEX REPLACE "(^| )${old}($| )" " ${new} " ${var} "${${var}}" ) if( "${${var}}" MATCHES "(^| )${new}($| )" )
set(n "")
else() else()
set( ${var} "${${var}} ${new}" ) set(n "${new}")
endif() endif()
endmacro(llvm_replace_compiler_option) if( "${${var}}" MATCHES "(^| )${old}($| )" )
string( REGEX REPLACE "(^| )${old}($| )" " ${n} " ${var} "${${var}}" )
else()
set( ${var} "${${var}} ${n}" )
endif()
set( ${var} "${${var}}" PARENT_SCOPE )
endfunction(llvm_replace_compiler_option)
macro(add_td_sources srcs) macro(add_td_sources srcs)
file(GLOB tds *.td) file(GLOB tds *.td)
@ -52,15 +59,15 @@ function(llvm_process_sources OUT_VAR)
if( CMAKE_COMPILER_IS_GNUCXX ) if( CMAKE_COMPILER_IS_GNUCXX )
add_definitions( -fno-exceptions ) add_definitions( -fno-exceptions )
elseif( MSVC ) 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 ) add_definitions( /D_HAS_EXCEPTIONS=0 )
endif() endif()
endif() endif()
if( NOT LLVM_REQUIRES_RTTI ) if( NOT LLVM_REQUIRES_RTTI )
if( CMAKE_COMPILER_IS_GNUCXX ) if( CMAKE_COMPILER_IS_GNUCXX )
add_definitions( -fno-rtti ) llvm_replace_compiler_option(CMAKE_CXX_FLAGS "-frtti" "-fno-rtti")
elseif( MSVC ) elseif( MSVC )
string( REGEX REPLACE "[ ^]/GR ?" " /GR- " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) llvm_replace_compiler_option(CMAKE_CXX_FLAGS "/GR" "/GR-")
endif() endif()
endif() endif()