diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2011-04-05 17:02:48 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2011-04-05 17:02:48 +0000 |
| commit | e7510c2e9648ab8e887d7b40d913c7a7db784d67 (patch) | |
| tree | 5bb5ead502e2ed4646ed07898e02b8bcbbccf8c6 | |
| parent | b793bc1ccabef36b3223bae69f5e94a8e98d22eb (diff) | |
Rename LLVMConfig.cmake to LLVM-Config.cmake. The *Config.cmake naming
scheme is used by the functionality related to find_package.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@128889 91177308-0d34-0410-b5e6-96231b3b80d8
| -rwxr-xr-x | cmake/modules/AddLLVM.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | cmake/modules/LLVM-Config.cmake (renamed from cmake/modules/LLVMConfig.cmake) | 0 | ||||
| -rw-r--r-- | cmake/modules/LLVM.cmake | 4 | ||||
| -rw-r--r-- | tools/llvm-config/CMakeLists.txt | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index df739b41199..6087094e835 100755 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -1,5 +1,5 @@ include(LLVMProcessSources) -include(LLVMConfig) +include(LLVM-Config) macro(add_llvm_library name) llvm_process_sources( ALL_FILES ${ARGN} ) diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt index 1ab94749f15..036ee05cfb3 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt @@ -9,7 +9,7 @@ configure_file( install(FILES ${llvm_cmake_builddir}/LLVM.cmake - LLVMConfig.cmake + LLVM-Config.cmake LLVMLibDeps.cmake DESTINATION share/llvm/cmake) @@ -18,7 +18,7 @@ install(DIRECTORY . FILES_MATCHING PATTERN *.cmake PATTERN .svn EXCLUDE PATTERN LLVM.cmake EXCLUDE - PATTERN LLVMConfig.cmake EXCLUDE + PATTERN LLVM-Config.cmake EXCLUDE PATTERN LLVMLibDeps.cmake EXCLUDE PATTERN FindBison.cmake EXCLUDE PATTERN GetTargetTriple.cmake EXCLUDE @@ -27,6 +27,6 @@ install(DIRECTORY . install(FILES ${llvm_cmake_builddir}/LLVM.cmake - LLVMConfig.cmake + LLVM-Config.cmake LLVMLibDeps.cmake DESTINATION share/llvm/cmake) diff --git a/cmake/modules/LLVMConfig.cmake b/cmake/modules/LLVM-Config.cmake index bd6a7a2c553..bd6a7a2c553 100755 --- a/cmake/modules/LLVMConfig.cmake +++ b/cmake/modules/LLVM-Config.cmake diff --git a/cmake/modules/LLVM.cmake b/cmake/modules/LLVM.cmake index 8afc63d7a38..04abb9d2c2b 100644 --- a/cmake/modules/LLVM.cmake +++ b/cmake/modules/LLVM.cmake @@ -28,13 +28,13 @@ set(LLVM_ON_WIN32 @LLVM_ON_WIN32@) # 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 ) +include( LLVM-Config 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 ) + include( LLVM-Config ) endif() diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt index 1f5aaf4d366..bc23a64d0ef 100644 --- a/tools/llvm-config/CMakeLists.txt +++ b/tools/llvm-config/CMakeLists.txt @@ -142,7 +142,7 @@ install(FILES ${LLVM_CONFIG} # 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. set(LLVMLibDeps ${LLVM_MAIN_SRC_DIR}/cmake/modules/LLVMLibDeps.cmake) |