X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cmake%2Fmodules%2FCMakeLists.txt;h=f51e9af8db0db2b77a19fa8ab65b7537e49a0d1a;hb=e2ff00e117ba9b758b298e671f65c0b002f8a52d;hp=8448486105d393e61ad099020de70892e2a435a3;hpb=d538e249224a91f85bd4297c71b2bfa71113a9ad;p=oota-llvm.git

diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index 8448486105d..f51e9af8db0 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -1,29 +1,37 @@
 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm/cmake")
+set(LLVM_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+
+get_property(llvm_libs GLOBAL PROPERTY LLVM_LIBS)
+
+foreach(lib ${llvm_libs})
+  get_property(llvm_lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${lib})
+  set(all_llvm_lib_deps
+    "${all_llvm_lib_deps}\nset_property(GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${lib} ${llvm_lib_deps})")
+endforeach(lib)
+
+configure_file(
+  LLVMConfig.cmake.in
+  ${llvm_cmake_builddir}/LLVMConfig.cmake
+  @ONLY)
 
 configure_file(
-  LLVM.cmake
-  ${llvm_cmake_builddir}/LLVM.cmake
+  LLVMConfigVersion.cmake.in
+  ${llvm_cmake_builddir}/LLVMConfigVersion.cmake
   @ONLY)
 
 install(FILES
-  ${llvm_cmake_builddir}/LLVM.cmake
-  LLVMConfig.cmake
-  LLVMLibDeps.cmake
+  ${llvm_cmake_builddir}/LLVMConfig.cmake
+  ${llvm_cmake_builddir}/LLVMConfigVersion.cmake
+  LLVM-Config.cmake
   DESTINATION share/llvm/cmake)
 
 install(DIRECTORY .
   DESTINATION share/llvm/cmake
-  PATTERN *.cmake
-  PATTERN LLVM.cmake EXCLUDE
+  FILES_MATCHING PATTERN *.cmake
+  PATTERN .svn EXCLUDE
   PATTERN LLVMConfig.cmake EXCLUDE
-  PATTERN LLVMLibDeps.cmake EXCLUDE
-  PATTERN FindBison.cmake EXCLUDE
-  PATTERN GetTargetTriple.cmake EXCLUDE
+  PATTERN LLVMConfigVersion.cmake EXCLUDE
+  PATTERN LLVM-Config.cmake EXCLUDE
+  PATTERN GetHostTriple.cmake EXCLUDE
   PATTERN VersionFromVCS.cmake EXCLUDE
   PATTERN CheckAtomic.cmake EXCLUDE)
-
-install(FILES
-  ${llvm_cmake_builddir}/LLVM.cmake
-  LLVMConfig.cmake
-  LLVMLibDeps.cmake
-  DESTINATION share/llvm/cmake)