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

Rename LLVMConfig.cmake to LLVM-Config.cmake. The *Config.cmake naming 

scheme is used by the functionality related to find_package.

llvm-svn: 128889
This commit is contained in:
Oscar Fuentes 2011-04-05 17:02:48 +00:00
parent 76ad3debab
commit d8a6dd6c99
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/cmake/modules/AddLLVM.cmake
View File

@ -1,5 +1,5 @@
include(LLVMProcessSources) include(LLVMProcessSources)
include(LLVMConfig) include(LLVM-Config)
macro(add_llvm_library name) macro(add_llvm_library name)
llvm_process_sources( ALL_FILES ${ARGN} ) llvm_process_sources( ALL_FILES ${ARGN} )

6
llvm/cmake/modules/CMakeLists.txt
View File

@ -9,7 +9,7 @@ configure_file(
install(FILES install(FILES
${llvm_cmake_builddir}/LLVM.cmake ${llvm_cmake_builddir}/LLVM.cmake
LLVMConfig.cmake LLVM-Config.cmake
LLVMLibDeps.cmake LLVMLibDeps.cmake
DESTINATION share/llvm/cmake) DESTINATION share/llvm/cmake)
@ -18,7 +18,7 @@ install(DIRECTORY .
FILES_MATCHING PATTERN *.cmake FILES_MATCHING PATTERN *.cmake
PATTERN .svn EXCLUDE PATTERN .svn EXCLUDE
PATTERN LLVM.cmake EXCLUDE PATTERN LLVM.cmake EXCLUDE
PATTERN LLVMConfig.cmake EXCLUDE PATTERN LLVM-Config.cmake EXCLUDE
PATTERN LLVMLibDeps.cmake EXCLUDE PATTERN LLVMLibDeps.cmake EXCLUDE
PATTERN FindBison.cmake EXCLUDE PATTERN FindBison.cmake EXCLUDE
PATTERN GetTargetTriple.cmake EXCLUDE PATTERN GetTargetTriple.cmake EXCLUDE
@ -27,6 +27,6 @@ install(DIRECTORY .
install(FILES install(FILES
${llvm_cmake_builddir}/LLVM.cmake ${llvm_cmake_builddir}/LLVM.cmake
LLVMConfig.cmake LLVM-Config.cmake
LLVMLibDeps.cmake LLVMLibDeps.cmake
DESTINATION share/llvm/cmake) DESTINATION share/llvm/cmake)

0
llvm/cmake/modules/LLVMConfig.cmake → llvm/cmake/modules/LLVM-Config.cmake
View File

4
llvm/cmake/modules/LLVM.cmake
View File

@ -28,13 +28,13 @@ set(LLVM_ON_WIN32 @LLVM_ON_WIN32@)
# We try to include using the current setting of CMAKE_MODULE_PATH, # We try to include using the current setting of CMAKE_MODULE_PATH,
# which suppossedly was filled by the user with the directory where # which suppossedly was filled by the user with the directory where
# this file was installed: # this file was installed:
include( LLVMConfig OPTIONAL RESULT_VARIABLE LLVMCONFIG_INCLUDED ) include( LLVM-Config OPTIONAL RESULT_VARIABLE LLVMCONFIG_INCLUDED )
# If failed, we assume that this is an un-installed build: # If failed, we assume that this is an un-installed build:
if( NOT LLVMCONFIG_INCLUDED ) if( NOT LLVMCONFIG_INCLUDED )
set(CMAKE_MODULE_PATH set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH}
"@LLVM_SOURCE_DIR@/cmake/modules") "@LLVM_SOURCE_DIR@/cmake/modules")
include( LLVMConfig ) include( LLVM-Config )
endif() endif()

2
llvm/tools/llvm-config/CMakeLists.txt
View File

@ -142,7 +142,7 @@ install(FILES ${LLVM_CONFIG}
# Regeneration of library dependencies. # Regeneration of library dependencies.
# See the comments at the end of cmake/modules/LLVMConfig.cmake for # See the comments at the end of cmake/modules/LLVM-Config.cmake for
# notes and guidelines. # notes and guidelines.
set(LLVMLibDeps ${LLVM_MAIN_SRC_DIR}/cmake/modules/LLVMLibDeps.cmake) set(LLVMLibDeps ${LLVM_MAIN_SRC_DIR}/cmake/modules/LLVMLibDeps.cmake)