diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2010-08-11 00:51:32 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2010-08-11 00:51:32 +0000 |
| commit | 945f64ebac5d957c2c26b0e572ebc45092621208 (patch) | |
| tree | f64a196bf2eb8e88b719f70e468a2d160339e646 | |
| parent | 79553bad506a5514eb06af4efb5f3b2e1fbe50cd (diff) | |
| download | bcm5719-llvm-945f64ebac5d957c2c26b0e572ebc45092621208.tar.gz bcm5719-llvm-945f64ebac5d957c2c26b0e572ebc45092621208.zip | |
CMake: corrections on LLVM.cmake external services.
llvm-svn: 110763
| -rw-r--r-- | llvm/cmake/modules/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | llvm/cmake/modules/LLVM.cmake | 14 | ||||
| -rwxr-xr-x | llvm/cmake/modules/LLVMConfig.cmake | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt index 03b1e83da25..416d7f47856 100644 --- a/llvm/cmake/modules/CMakeLists.txt +++ b/llvm/cmake/modules/CMakeLists.txt @@ -2,7 +2,8 @@ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm/cmake") configure_file( LLVM.cmake - ${llvm_cmake_builddir}/LLVM.cmake) + ${llvm_cmake_builddir}/LLVM.cmake + @ONLY) install(FILES ${llvm_cmake_builddir}/LLVM.cmake diff --git a/llvm/cmake/modules/LLVM.cmake b/llvm/cmake/modules/LLVM.cmake index b055d83f918..9621454f411 100644 --- a/llvm/cmake/modules/LLVM.cmake +++ b/llvm/cmake/modules/LLVM.cmake @@ -1,3 +1,5 @@ +# This file provides information and services to the final user. + set(LLVM_COMMON_DEPENDS @LLVM_COMMON_DEPENDS@) set(llvm_libs @llvm_libs@) @@ -10,10 +12,18 @@ set(LLVM_TOOLS_BINARY_DIR @LLVM_TOOLS_BINARY_DIR@) set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@) -if( NOT EXISTS LLVMConfig.cmake ) +set(LLVM_NATIVE_ARCH @LLVM_NATIVE_ARCH@) + +# We try to include using the current setting of CMAKE_MODULE_PATH, +# which suppossedly was filled by the user with the directory where +# this file was installed: +include( LLVMConfig OPTIONAL RESULT_VARIABLE LLVMCONFIG_INCLUDED ) + +# If failed, we assume that this is an un-installed build: +if( NOT LLVMCONFIG_INCLUDED ) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "@LLVM_SOURCE_DIR@/cmake/modules") + include( LLVMConfig ) endif() -include( LLVMConfig ) diff --git a/llvm/cmake/modules/LLVMConfig.cmake b/llvm/cmake/modules/LLVMConfig.cmake index c623bfaba8d..328aebf4b6d 100755 --- a/llvm/cmake/modules/LLVMConfig.cmake +++ b/llvm/cmake/modules/LLVMConfig.cmake @@ -53,7 +53,7 @@ endfunction(explicit_llvm_config) function(llvm_map_components_to_libraries OUT_VAR) explicit_map_components_to_libraries(result ${ARGN}) get_system_libs(sys_result) - set( ${OUT_VAR} ${result} ${sys_result} ) + set( ${OUT_VAR} ${result} ${sys_result} PARENT_SCOPE ) endfunction(llvm_map_components_to_libraries) |
