[llvm-commits] [llvm] r110060 - /llvm/trunk/cmake/modules/LLVMConfig.cmake

[Tom Care]

Thanks Oscar :)
On Aug 2, 2010, at 1:48 PM, Oscar Fuentes wrote:

> Author: ofv
> Date: Mon Aug  2 15:48:01 2010
> New Revision: 110060
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=110060&view=rev
> Log:
> explicit_map_components_to_libraries now does not complain when there
> is a dependence on an LLVM target that is not included on the build.
> 
> When LLVM_TARGETS_TO_BUILD didn't include all the targets, the
> function emitted an error like
> 
> "Library LLVMArmParser not found in list of llvm libraries."
> 
> Modified:
>    llvm/trunk/cmake/modules/LLVMConfig.cmake
> 
> Modified: llvm/trunk/cmake/modules/LLVMConfig.cmake
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMConfig.cmake?rev=110060&r1=110059&r2=110060&view=diff
> ==============================================================================
> --- llvm/trunk/cmake/modules/LLVMConfig.cmake (original)
> +++ llvm/trunk/cmake/modules/LLVMConfig.cmake Mon Aug  2 15:48:01 2010
> @@ -16,6 +16,24 @@
> endfunction(get_system_libs)
> 
> 
> +function(is_llvm_target_library library return_var)
> +  # Sets variable `return_var' to ON if `library' corresponds to a
> +  # LLVM supported target. To OFF if it doesn't.
> +  set(${return_var} OFF PARENT_SCOPE)
> +  string(TOUPPER "${library}" capitalized_lib)
> +  string(TOUPPER "${LLVM_ALL_TARGETS}" targets)
> +  foreach(t ${targets})
> +    if( capitalized_lib STREQUAL "LLVM${t}CODEGEN" OR
> +	capitalized_lib STREQUAL "LLVM${t}ASMPARSER" OR
> +	capitalized_lib STREQUAL "LLVM${t}DISASSEMBLER" OR
> +	capitalized_lib STREQUAL "LLVM${t}INFO" )
> +      set(${return_var} ON PARENT_SCOPE)
> +      break()
> +    endif()
> +  endforeach()
> +endfunction(is_llvm_target_library)
> +
> +
> macro(llvm_config executable)
>   explicit_llvm_config(${executable} ${ARGN})
> endmacro(llvm_config)
> @@ -87,7 +105,13 @@
>     string(TOUPPER "${c}" capitalized)
>     list(FIND capitalized_libs ${capitalized} idx)
>     if( idx LESS 0 )
> -      message(FATAL_ERROR "Library ${c} not found in list of llvm libraries.")
> +      # The library is unkown. Maybe is an ommitted target?
> +      is_llvm_target_library(${c} iltl_result)
> +      if( iltl_result )
> +	break()
> +      else()
> +	message(FATAL_ERROR "Library ${c} not found in list of llvm libraries.")
> +      endif()
>     endif( idx LESS 0 )
>     list(GET llvm_libs ${idx} canonical_lib)
>     list(REMOVE_ITEM result ${canonical_lib})
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits