wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve discrimination of unknown libraries from ignored targets on 

LLVMConfig.

llvm-svn: 110065
This commit is contained in:
Oscar Fuentes 2010-08-02 21:24:12 +00:00
parent 8402832e50
commit d945ae652a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/cmake/modules/LLVMConfig.cmake
View File

@ -23,8 +23,10 @@ function(is_llvm_target_library library return_var)
string(TOUPPER "${library}" capitalized_lib) string(TOUPPER "${library}" capitalized_lib)
string(TOUPPER "${LLVM_ALL_TARGETS}" targets) string(TOUPPER "${LLVM_ALL_TARGETS}" targets)
foreach(t ${targets}) foreach(t ${targets})
if( capitalized_lib STREQUAL "LLVM${t}CODEGEN" OR if( capitalized_lib STREQUAL "LLVM${t}" OR
capitalized_lib STREQUAL "LLVM${t}CODEGEN" OR
capitalized_lib STREQUAL "LLVM${t}ASMPARSER" OR capitalized_lib STREQUAL "LLVM${t}ASMPARSER" OR
capitalized_lib STREQUAL "LLVM${t}ASMPRINTER" OR
capitalized_lib STREQUAL "LLVM${t}DISASSEMBLER" OR capitalized_lib STREQUAL "LLVM${t}DISASSEMBLER" OR
capitalized_lib STREQUAL "LLVM${t}INFO" ) capitalized_lib STREQUAL "LLVM${t}INFO" )
set(${return_var} ON PARENT_SCOPE) set(${return_var} ON PARENT_SCOPE)
@ -104,22 +106,24 @@ function(explicit_map_components_to_libraries out_libs)
list(GET expanded_components 0 c) list(GET expanded_components 0 c)
string(TOUPPER "${c}" capitalized) string(TOUPPER "${c}" capitalized)
list(FIND capitalized_libs ${capitalized} idx) list(FIND capitalized_libs ${capitalized} idx)
set(add_it ON)
if( idx LESS 0 ) if( idx LESS 0 )
# The library is unkown. Maybe is an ommitted target? # The library is unkown. Maybe is an ommitted target?
is_llvm_target_library(${c} iltl_result) is_llvm_target_library(${c} iltl_result)
if( iltl_result ) if( NOT iltl_result )
break()
else()
message(FATAL_ERROR "Library ${c} not found in list of llvm libraries.") message(FATAL_ERROR "Library ${c} not found in list of llvm libraries.")
endif() endif()
set(add_it OFF)
endif( idx LESS 0 ) endif( idx LESS 0 )
list(GET llvm_libs ${idx} canonical_lib) list(GET llvm_libs ${idx} canonical_lib)
list(REMOVE_ITEM result ${canonical_lib}) list(REMOVE_ITEM result ${canonical_lib})
list(APPEND result ${canonical_lib})
foreach(c ${MSVC_LIB_DEPS_${canonical_lib}}) foreach(c ${MSVC_LIB_DEPS_${canonical_lib}})
list(REMOVE_ITEM expanded_components ${c}) list(REMOVE_ITEM expanded_components ${c})
endforeach() endforeach()
list(APPEND expanded_components ${MSVC_LIB_DEPS_${canonical_lib}}) if( add_it )
list(APPEND result ${canonical_lib})
list(APPEND expanded_components ${MSVC_LIB_DEPS_${canonical_lib}})
endif()
list(REMOVE_AT expanded_components 0) list(REMOVE_AT expanded_components 0)
list(LENGTH expanded_components lst_size) list(LENGTH expanded_components lst_size)
endwhile( 0 LESS ${lst_size} ) endwhile( 0 LESS ${lst_size} )