Rewrite the CMake build to use explicit dependencies between libraries,

specified in the same file that the library itself is created. This is
more idiomatic for CMake builds, and also allows us to correctly specify
dependencies that are missed due to bugs in the GenLibDeps perl script,
or change from compiler to compiler. On Linux, this returns CMake to
a place where it can relably rebuild several targets of LLVM.

I have tried not to change the dependencies from the ones in the current
auto-generated file. The only places I've really diverged are in places
where I was seeing link failures, and added a dependency. The goal of
this patch is not to start changing the dependencies, merely to move
them into the correct location, and an explicit form that we can control
and change when necessary.

This also removes a serialization point in the build because we don't
have to scan all the libraries before we begin building various tools.
We no longer have a step of the build that regenerates a file inside the
source tree. A few other associated cleanups fall out of this.

This isn't really finished yet though. After talking to dgregor he urged
switching to a single CMake macro to construct libraries with both
sources and dependencies in the arguments. Migrating from the two macros
to that style will be a follow-up patch.

Also, llvm-config is still generated with GenLibDeps.pl, which means it
still has slightly buggy dependencies. The internal CMake
'llvm-config-like' macro uses the correct explicitly specified
dependencies however. A future patch will switch llvm-config generation
(when using CMake) to be based on these deps as well.

This may well break Windows. I'm getting a machine set up now to dig
into any failures there. If anyone can chime in with problems they see
or ideas of how to solve them for Windows, much appreciated.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136433 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/AddLLVM.cmake

@@ -34,6 +34,14 @@ macro(add_llvm_library name)
   set_target_properties(${name} PROPERTIES FOLDER "Libraries")
 endmacro(add_llvm_library name)
 
+macro(add_llvm_library_dependencies name)
+  # Save the dependencies of the LLVM library in a variable so that we can
+  # query it when resolve llvm-config-style component -> library mappings.
+  set(LLVM_LIB_DEPS_${name} ${ARGN})
+
+  # Then add the actual dependencies to the library target.
+  target_link_libraries(${name} ${ARGN})
+endmacro(add_llvm_library_dependencies name)
 
 macro(add_llvm_loadable_module name)
   if( NOT LLVM_ON_UNIX OR CYGWIN )

cmake/modules/CMakeLists.txt

@@ -17,7 +17,6 @@ install(FILES
   ${llvm_cmake_builddir}/LLVMConfig.cmake
   ${llvm_cmake_builddir}/LLVMConfigVersion.cmake
   LLVM-Config.cmake
-  LLVMLibDeps.cmake
   DESTINATION share/llvm/cmake)
 
 install(DIRECTORY .
@@ -27,7 +26,6 @@ install(DIRECTORY .
   PATTERN LLVMConfig.cmake EXCLUDE
   PATTERN LLVMConfigVersion.cmake EXCLUDE
   PATTERN LLVM-Config.cmake EXCLUDE
-  PATTERN LLVMLibDeps.cmake EXCLUDE
   PATTERN FindBison.cmake EXCLUDE
   PATTERN GetTargetTriple.cmake EXCLUDE
   PATTERN VersionFromVCS.cmake EXCLUDE

cmake/modules/LLVM-Config.cmake

@@ -152,7 +152,7 @@ function(explicit_map_components_to_libraries out_libs)
   set(processed)
   while( cursor LESS lst_size )
     list(GET expanded_components ${cursor} lib)
-    list(APPEND expanded_components ${MSVC_LIB_DEPS_${lib}})
+    list(APPEND expanded_components ${LLVM_LIB_DEPS_${lib}})
     # Remove duplicates at the front:
     list(REVERSE expanded_components)
     list(REMOVE_DUPLICATES expanded_components)
@@ -175,29 +175,3 @@ function(explicit_map_components_to_libraries out_libs)
   endforeach(c)
   set(${out_libs} ${result} PARENT_SCOPE)
 endfunction(explicit_map_components_to_libraries)
-
-
-# The library dependency data is contained in the file
-# LLVMLibDeps.cmake on this directory. It is automatically generated
-# by tools/llvm-config/CMakeLists.txt when the build comprises all the
-# targets and we are on a environment Posix enough to build the
-# llvm-config script. This, in practice, just excludes MSVC.
-
-# When you remove or rename a library from the build, be sure to
-# remove its file from lib/ as well, or the GenLibDeps.pl script will
-# include it on its analysis!
-
-# The format generated by GenLibDeps.pl
-
-# LLVMARMAsmPrinter.o: LLVMARMCodeGen.o libLLVMAsmPrinter.a libLLVMCodeGen.a libLLVMCore.a libLLVMSupport.a libLLVMTarget.a
-
-# is translated to:
-
-# set(MSVC_LIB_DEPS_LLVMARMAsmPrinter LLVMARMCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSupport LLVMTarget)
-
-# It is necessary to remove the `lib' prefix and the `.a'.
-
-# This 'sed' script should do the trick:
-# sed -e s'#\.a##g' -e 's#libLLVM#LLVM#g' -e 's#: # #' -e 's#\(.*\)#set(MSVC_LIB_DEPS_\1)#' ~/llvm/tools/llvm-config/LibDeps.txt
-
-include(LLVMLibDeps)

lib/Analysis/CMakeLists.txt

@@ -58,4 +58,10 @@ add_llvm_library(LLVMAnalysis
   ValueTracking.cpp
   )
 
+add_llvm_library_dependencies(LLVMAnalysis
+  LLVMCore
+  LLVMSupport
+  LLVMTarget
+  )
+
 add_subdirectory(IPA)

lib/Analysis/IPA/CMakeLists.txt

@@ -5,3 +5,9 @@ add_llvm_library(LLVMipa
   GlobalsModRef.cpp
   IPA.cpp
   )
+
+add_llvm_library_dependencies(LLVMipa
+  LLVMAnalysis
+  LLVMCore
+  LLVMSupport
+  )

lib/Archive/CMakeLists.txt

@@ -3,3 +3,9 @@ add_llvm_library(LLVMArchive
   ArchiveReader.cpp
   ArchiveWriter.cpp
   )
+
+add_llvm_library_dependencies(LLVMArchive
+  LLVMBitReader
+  LLVMCore
+  LLVMSupport
+  )

lib/AsmParser/CMakeLists.txt

@@ -4,3 +4,8 @@ add_llvm_library(LLVMAsmParser
   LLParser.cpp
   Parser.cpp
   )
+
+add_llvm_library_dependencies(LLVMAsmParser
+  LLVMCore
+  LLVMSupport
+  )

lib/Bitcode/Reader/CMakeLists.txt

@@ -2,3 +2,8 @@ add_llvm_library(LLVMBitReader
   BitReader.cpp
   BitcodeReader.cpp
   )
+
+add_llvm_library_dependencies(LLVMBitReader
+  LLVMCore
+  LLVMSupport
+  )

lib/Bitcode/Writer/CMakeLists.txt

@@ -4,3 +4,8 @@ add_llvm_library(LLVMBitWriter
   BitcodeWriterPass.cpp
   ValueEnumerator.cpp
   )
+
+add_llvm_library_dependencies(LLVMBitWriter
+  LLVMCore
+  LLVMSupport
+  )

lib/CodeGen/AsmPrinter/CMakeLists.txt

@@ -12,3 +12,12 @@ add_llvm_library(LLVMAsmPrinter
   Win64Exception.cpp
   )
 
+add_llvm_library_dependencies(LLVMAsmPrinter
+  LLVMAnalysis
+  LLVMCodeGen
+  LLVMCore
+  LLVMMC
+  LLVMMCParser
+  LLVMSupport
+  LLVMTarget
+  )

lib/CodeGen/CMakeLists.txt

@@ -97,5 +97,15 @@ add_llvm_library(LLVMCodeGen
   VirtRegRewriter.cpp
   )
 
+add_llvm_library_dependencies(LLVMCodeGen
+  LLVMAnalysis
+  LLVMCore
+  LLVMMC
+  LLVMScalarOpts
+  LLVMSupport
+  LLVMTarget
+  LLVMTransformUtils
+  )
+
 add_subdirectory(SelectionDAG)
 add_subdirectory(AsmPrinter)

lib/CodeGen/SelectionDAG/CMakeLists.txt

@@ -21,3 +21,13 @@ add_llvm_library(LLVMSelectionDAG
   TargetLowering.cpp
   TargetSelectionDAGInfo.cpp
   )
+
+add_llvm_library_dependencies(LLVMSelectionDAG
+  LLVMAnalysis
+  LLVMCodeGen
+  LLVMCore
+  LLVMMC
+  LLVMSupport
+  LLVMTarget
+  LLVMTransformUtils
+  )

lib/ExecutionEngine/CMakeLists.txt

@@ -4,6 +4,13 @@ add_llvm_library(LLVMExecutionEngine
   TargetSelect.cpp
   )
 
+add_llvm_library_dependencies(LLVMExecutionEngine
+  LLVMCore
+  LLVMMC
+  LLVMSupport
+  LLVMTarget
+  )
+
 add_subdirectory(Interpreter)
 add_subdirectory(JIT)
 add_subdirectory(MCJIT)

lib/ExecutionEngine/Interpreter/CMakeLists.txt

@@ -12,6 +12,14 @@ add_llvm_library(LLVMInterpreter
   Interpreter.cpp
   )
 
+add_llvm_library_dependencies(LLVMInterpreter
+  LLVMCodeGen
+  LLVMCore
+  LLVMExecutionEngine
+  LLVMSupport
+  LLVMTarget
+  )
+
 if( LLVM_ENABLE_FFI )
   target_link_libraries( LLVMInterpreter ${FFI_LIBRARY_PATH} )
 endif()

lib/ExecutionEngine/JIT/CMakeLists.txt

@@ -10,3 +10,11 @@ add_llvm_library(LLVMJIT
   JITMemoryManager.cpp
   OProfileJITEventListener.cpp
   )
+
+add_llvm_library_dependencies(LLVMJIT
+  LLVMCore
+  LLVMExecutionEngine
+  LLVMRuntimeDyld
+  LLVMSupport
+  LLVMTarget
+  )

lib/ExecutionEngine/MCJIT/CMakeLists.txt

@@ -2,3 +2,11 @@ add_llvm_library(LLVMMCJIT
   MCJIT.cpp
   Intercept.cpp
   )
+
+add_llvm_library_dependencies(LLVMMCJIT
+  LLVMCore
+  LLVMExecutionEngine
+  LLVMRuntimeDyld
+  LLVMSupport
+  LLVMTarget
+  )

lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt

@@ -2,3 +2,8 @@ add_llvm_library(LLVMRuntimeDyld
   RuntimeDyld.cpp
   RuntimeDyldMachO.cpp
   )
+
+add_llvm_library_dependencies(LLVMRuntimeDyld
+  LLVMObject
+  LLVMSupport
+  )

lib/Linker/CMakeLists.txt

@@ -4,3 +4,11 @@ add_llvm_library(LLVMLinker
   LinkModules.cpp
   Linker.cpp
   )
+
+add_llvm_library_dependencies(LLVMLinker
+  LLVMArchive
+  LLVMBitReader
+  LLVMCore
+  LLVMSupport
+  LLVMTransformUtils
+  )

lib/MC/CMakeLists.txt

@@ -42,5 +42,10 @@ add_llvm_library(LLVMMC
   MCTargetAsmLexer.cpp
   )
 
+add_llvm_library_dependencies(LLVMMC
+  LLVMObject
+  LLVMSupport
+  )
+
 add_subdirectory(MCParser)
 add_subdirectory(MCDisassembler)

lib/MC/MCDisassembler/CMakeLists.txt

@@ -1,8 +1,48 @@
-
 add_llvm_library(LLVMMCDisassembler
   Disassembler.cpp
   EDDisassembler.cpp
   EDInst.cpp
   EDOperand.cpp
   EDToken.cpp
   )
+
+add_llvm_library_dependencies(LLVMMCDisassembler
+  LLVMARMAsmParser
+  LLVMARMDesc
+  LLVMARMDisassembler
+  LLVMARMInfo
+  LLVMAlphaDesc
+  LLVMAlphaInfo
+  LLVMBlackfinDesc
+  LLVMBlackfinInfo
+  LLVMCBackendInfo
+  LLVMCellSPUDesc
+  LLVMCellSPUInfo
+  LLVMCppBackendInfo
+  LLVMMBlazeAsmParser
+  LLVMMBlazeDesc
+  LLVMMBlazeDisassembler
+  LLVMMBlazeInfo
+  LLVMMC
+  LLVMMCParser
+  LLVMMSP430Desc
+  LLVMMSP430Info
+  LLVMMipsDesc
+  LLVMMipsInfo
+  LLVMPTXDesc
+  LLVMPTXInfo
+  LLVMPowerPCDesc
+  LLVMPowerPCInfo
+  LLVMSparcDesc
+  LLVMSparcInfo
+  LLVMSupport
+  LLVMSystemZDesc
+  LLVMSystemZInfo
+  LLVMTarget
+  LLVMX86AsmParser
+  LLVMX86Desc
+  LLVMX86Disassembler
+  LLVMX86Info
+  LLVMXCoreDesc
+  LLVMXCoreInfo
+  )

lib/MC/MCParser/CMakeLists.txt

@@ -9,3 +9,8 @@ add_llvm_library(LLVMMCParser
   MCAsmParserExtension.cpp
   MCTargetAsmParser.cpp
   )
+
+add_llvm_library_dependencies(LLVMMCParser
+  LLVMMC
+  LLVMSupport
+  )