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 similarity index 100% rename from cmake/modules/LLVMConfig.cmake rename to 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)