diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 5e3a4c1c43451dd1d979a7a9cfb464d921740c4c..cf9ea72107d5c9beaad4b3f57ff61dcad84c174a 100755 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/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 ) diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt index 257deb6d4c7a6c39340b3b696107b103636b130a..298da95d1e151bac0fa1e1072ec1af815472537c 100644 --- a/llvm/cmake/modules/CMakeLists.txt +++ b/llvm/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 diff --git a/llvm/cmake/modules/LLVM-Config.cmake b/llvm/cmake/modules/LLVM-Config.cmake index a6286fee6856402d01ca7d3a238dd45a2b494cd3..d6b31245b066bf679d86a9cb7e1d8830a3f2c2ab 100755 --- a/llvm/cmake/modules/LLVM-Config.cmake +++ b/llvm/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) diff --git a/llvm/cmake/modules/LLVMLibDeps.cmake b/llvm/cmake/modules/LLVMLibDeps.cmake deleted file mode 100644 index 4aded2cf583f6f403381edb2599bf1021cfbd88f..0000000000000000000000000000000000000000 --- a/llvm/cmake/modules/LLVMLibDeps.cmake +++ /dev/null @@ -1,83 +0,0 @@ -set(MSVC_LIB_DEPS_LLVMARMAsmParser LLVMARMDesc LLVMARMInfo LLVMMC LLVMMCParser LLVMSupport) -set(MSVC_LIB_DEPS_LLVMARMAsmPrinter LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMARMCodeGen LLVMARMAsmPrinter LLVMARMDesc LLVMARMInfo LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMARMDesc LLVMARMInfo LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMARMDisassembler LLVMARMDesc LLVMARMInfo LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMARMInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMAlphaCodeGen LLVMAlphaDesc LLVMAlphaInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMAlphaDesc LLVMAlphaInfo LLVMMC) -set(MSVC_LIB_DEPS_LLVMAlphaInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMAnalysis LLVMCore LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMArchive LLVMBitReader LLVMCore LLVMSupport) -set(MSVC_LIB_DEPS_LLVMAsmParser LLVMCore LLVMSupport) -set(MSVC_LIB_DEPS_LLVMAsmPrinter LLVMAnalysis LLVMCodeGen LLVMCore LLVMMC LLVMMCParser LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMBitReader LLVMCore LLVMSupport) -set(MSVC_LIB_DEPS_LLVMBitWriter LLVMCore LLVMSupport) -set(MSVC_LIB_DEPS_LLVMBlackfinCodeGen LLVMAsmPrinter LLVMBlackfinDesc LLVMBlackfinInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMBlackfinDesc LLVMBlackfinInfo LLVMMC) -set(MSVC_LIB_DEPS_LLVMBlackfinInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMCBackend LLVMAnalysis LLVMCBackendInfo LLVMCodeGen LLVMCore LLVMMC LLVMScalarOpts LLVMSupport LLVMTarget LLVMTransformUtils) -set(MSVC_LIB_DEPS_LLVMCBackendInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMCellSPUCodeGen LLVMAsmPrinter LLVMCellSPUDesc LLVMCellSPUInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMCellSPUDesc LLVMCellSPUInfo LLVMMC) -set(MSVC_LIB_DEPS_LLVMCellSPUInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMCodeGen LLVMAnalysis LLVMCore LLVMMC LLVMScalarOpts LLVMSupport LLVMTarget LLVMTransformUtils) -set(MSVC_LIB_DEPS_LLVMCore LLVMSupport) -set(MSVC_LIB_DEPS_LLVMCppBackend LLVMCore LLVMCppBackendInfo LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMCppBackendInfo LLVMMC LLVMTarget) -set(MSVC_LIB_DEPS_LLVMExecutionEngine LLVMCore LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMInstCombine LLVMAnalysis LLVMCore LLVMSupport LLVMTarget LLVMTransformUtils) -set(MSVC_LIB_DEPS_LLVMInstrumentation LLVMAnalysis LLVMCore LLVMSupport LLVMTransformUtils) -set(MSVC_LIB_DEPS_LLVMInterpreter LLVMCodeGen LLVMCore LLVMExecutionEngine LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMJIT LLVMCodeGen LLVMCore LLVMExecutionEngine LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMLinker LLVMArchive LLVMBitReader LLVMCore LLVMSupport LLVMTransformUtils) -set(MSVC_LIB_DEPS_LLVMMBlazeAsmParser LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMSupport) -set(MSVC_LIB_DEPS_LLVMMBlazeAsmPrinter LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMMBlazeCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMBlazeAsmPrinter LLVMMBlazeDesc LLVMMBlazeInfo LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMMBlazeDesc LLVMMBlazeInfo LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMMBlazeDisassembler LLVMMBlazeDesc LLVMMBlazeInfo LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMMBlazeInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_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) -set(MSVC_LIB_DEPS_LLVMMCJIT LLVMCore LLVMExecutionEngine LLVMRuntimeDyld LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMMCParser LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMMSP430AsmPrinter LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMMSP430CodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMMSP430AsmPrinter LLVMMSP430Desc LLVMMSP430Info LLVMSelectionDAG LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMMSP430Desc LLVMMC LLVMMSP430Info) -set(MSVC_LIB_DEPS_LLVMMSP430Info LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMMipsAsmPrinter LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMMipsCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMMipsAsmPrinter LLVMMipsDesc LLVMMipsInfo LLVMSelectionDAG LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMMipsDesc LLVMMC LLVMMipsInfo LLVMSupport) -set(MSVC_LIB_DEPS_LLVMMipsInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMObject LLVMSupport) -set(MSVC_LIB_DEPS_LLVMPTXCodeGen LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPTXDesc LLVMPTXInfo LLVMSelectionDAG LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMPTXDesc LLVMMC LLVMPTXInfo LLVMSupport) -set(MSVC_LIB_DEPS_LLVMPTXInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMPowerPCAsmPrinter LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMPowerPCCodeGen LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPowerPCAsmPrinter LLVMPowerPCDesc LLVMPowerPCInfo LLVMSelectionDAG LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMPowerPCDesc LLVMMC LLVMPowerPCInfo LLVMSupport) -set(MSVC_LIB_DEPS_LLVMPowerPCInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMRuntimeDyld LLVMObject LLVMSupport) -set(MSVC_LIB_DEPS_LLVMScalarOpts LLVMAnalysis LLVMCore LLVMInstCombine LLVMSupport LLVMTarget LLVMTransformUtils) -set(MSVC_LIB_DEPS_LLVMSelectionDAG LLVMAnalysis LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMTarget LLVMTransformUtils) -set(MSVC_LIB_DEPS_LLVMSparcCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSparcDesc LLVMSparcInfo LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMSparcDesc LLVMMC LLVMSparcInfo LLVMSupport) -set(MSVC_LIB_DEPS_LLVMSparcInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMSupport ) -set(MSVC_LIB_DEPS_LLVMSystemZCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystemZDesc LLVMSystemZInfo LLVMTarget) -set(MSVC_LIB_DEPS_LLVMSystemZDesc LLVMMC LLVMSystemZInfo) -set(MSVC_LIB_DEPS_LLVMSystemZInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMTarget LLVMCore LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMTransformUtils LLVMAnalysis LLVMCore LLVMSupport LLVMTarget LLVMipa) -set(MSVC_LIB_DEPS_LLVMX86AsmParser LLVMMC LLVMMCParser LLVMSupport LLVMX86Desc LLVMX86Info) -set(MSVC_LIB_DEPS_LLVMX86AsmPrinter LLVMMC LLVMSupport LLVMX86Utils) -set(MSVC_LIB_DEPS_LLVMX86CodeGen LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget LLVMX86AsmPrinter LLVMX86Desc LLVMX86Info LLVMX86Utils) -set(MSVC_LIB_DEPS_LLVMX86Desc LLVMMC LLVMSupport LLVMX86AsmPrinter LLVMX86Info) -set(MSVC_LIB_DEPS_LLVMX86Disassembler LLVMMC LLVMSupport LLVMX86Info) -set(MSVC_LIB_DEPS_LLVMX86Info LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMX86Utils LLVMCore LLVMSupport) -set(MSVC_LIB_DEPS_LLVMXCoreCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget LLVMXCoreDesc LLVMXCoreInfo) -set(MSVC_LIB_DEPS_LLVMXCoreDesc LLVMMC LLVMXCoreInfo) -set(MSVC_LIB_DEPS_LLVMXCoreInfo LLVMMC LLVMSupport LLVMTarget) -set(MSVC_LIB_DEPS_LLVMipa LLVMAnalysis LLVMCore LLVMSupport) -set(MSVC_LIB_DEPS_LLVMipo LLVMAnalysis LLVMCore LLVMScalarOpts LLVMSupport LLVMTarget LLVMTransformUtils LLVMipa) diff --git a/llvm/lib/Analysis/CMakeLists.txt b/llvm/lib/Analysis/CMakeLists.txt index cb1e1ebbd18ca096ac429b5278e21245400bd195..e79459d7a409276aec42f7a2bd37b3bcbf5cb81d 100644 --- a/llvm/lib/Analysis/CMakeLists.txt +++ b/llvm/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) diff --git a/llvm/lib/Analysis/IPA/CMakeLists.txt b/llvm/lib/Analysis/IPA/CMakeLists.txt index 8ffef29870ae0fef8fbf8d23ad2965c40c565e88..eae83fdc369ce30582fbc34affc40e2279de3540 100644 --- a/llvm/lib/Analysis/IPA/CMakeLists.txt +++ b/llvm/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 + ) diff --git a/llvm/lib/Archive/CMakeLists.txt b/llvm/lib/Archive/CMakeLists.txt index 7ff478a41a594c1e91e70109601ffdab7f3eb8a2..b52974e0753de210d863c762c35488da7fba8170 100644 --- a/llvm/lib/Archive/CMakeLists.txt +++ b/llvm/lib/Archive/CMakeLists.txt @@ -3,3 +3,9 @@ add_llvm_library(LLVMArchive ArchiveReader.cpp ArchiveWriter.cpp ) + +add_llvm_library_dependencies(LLVMArchive + LLVMBitReader + LLVMCore + LLVMSupport + ) diff --git a/llvm/lib/AsmParser/CMakeLists.txt b/llvm/lib/AsmParser/CMakeLists.txt index 985ebe20098854afc12c6c603a8e0dc491c748e3..749601510b5b0ae83cdfea8a3c23fdd0a30326d7 100644 --- a/llvm/lib/AsmParser/CMakeLists.txt +++ b/llvm/lib/AsmParser/CMakeLists.txt @@ -4,3 +4,8 @@ add_llvm_library(LLVMAsmParser LLParser.cpp Parser.cpp ) + +add_llvm_library_dependencies(LLVMAsmParser + LLVMCore + LLVMSupport + ) diff --git a/llvm/lib/Bitcode/Reader/CMakeLists.txt b/llvm/lib/Bitcode/Reader/CMakeLists.txt index 693d4310b834576facf1a38d84a9165d6d4918de..37bebc449635246ccc3d79a7ffdea7161bdc4658 100644 --- a/llvm/lib/Bitcode/Reader/CMakeLists.txt +++ b/llvm/lib/Bitcode/Reader/CMakeLists.txt @@ -2,3 +2,8 @@ add_llvm_library(LLVMBitReader BitReader.cpp BitcodeReader.cpp ) + +add_llvm_library_dependencies(LLVMBitReader + LLVMCore + LLVMSupport + ) diff --git a/llvm/lib/Bitcode/Writer/CMakeLists.txt b/llvm/lib/Bitcode/Writer/CMakeLists.txt index f097b097c3371d5e8124293c3892ec5f5aac8e0e..3cf905697a4252308b2e96a6c3bd78b67ae9511a 100644 --- a/llvm/lib/Bitcode/Writer/CMakeLists.txt +++ b/llvm/lib/Bitcode/Writer/CMakeLists.txt @@ -4,3 +4,8 @@ add_llvm_library(LLVMBitWriter BitcodeWriterPass.cpp ValueEnumerator.cpp ) + +add_llvm_library_dependencies(LLVMBitWriter + LLVMCore + LLVMSupport + ) diff --git a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt index 4da7876ea4fcfc1047482313431f3b0bbcd653e9..67d927348b54c612a511fa5fc95fa9f83a448fbd 100644 --- a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt +++ b/llvm/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 + ) diff --git a/llvm/lib/CodeGen/CMakeLists.txt b/llvm/lib/CodeGen/CMakeLists.txt index 5e4fb442199fa29cf69946674f13c5f82cad5e6b..9cbb25cebe7cc7e8f3b0dcf510d9b70fcb7f526e 100644 --- a/llvm/lib/CodeGen/CMakeLists.txt +++ b/llvm/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) diff --git a/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt b/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt index 15932c03a1908b6d83f56a4861eb1e05de241948..2282f0e6eb83c7572057e7c4599f453d0b50c796 100644 --- a/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt +++ b/llvm/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 + ) diff --git a/llvm/lib/ExecutionEngine/CMakeLists.txt b/llvm/lib/ExecutionEngine/CMakeLists.txt index 58caae830f4964a4b94f2ea81403f6177c2526e9..fb14d41e91d2d4999d00238daf0aac4d8a4c3e9e 100644 --- a/llvm/lib/ExecutionEngine/CMakeLists.txt +++ b/llvm/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) diff --git a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt index d331f830b62eee906217eb849317d708fd00197b..4fb58c2e3783b4cb48663c652f2afdcd0051f75b 100644 --- a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt +++ b/llvm/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() diff --git a/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt b/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt index cefb0aedde0ba0fadff19a009f0d7d18aedc6a5d..598e50e7946060cc7a1760195c85baaa7316ec9c 100644 --- a/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt +++ b/llvm/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 + ) diff --git a/llvm/lib/ExecutionEngine/MCJIT/CMakeLists.txt b/llvm/lib/ExecutionEngine/MCJIT/CMakeLists.txt index 38fdffa0e991c292bcef9ccbdaf908542a7b59b8..aae8a1b2c521e9e81f6847be9cf5f10161cc0e4d 100644 --- a/llvm/lib/ExecutionEngine/MCJIT/CMakeLists.txt +++ b/llvm/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 + ) diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt b/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt index 59bdfee3db435c94c4645a287aa26141399cda94..c236d1d9d115c7f68f2da9edfec719922750d344 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt @@ -2,3 +2,8 @@ add_llvm_library(LLVMRuntimeDyld RuntimeDyld.cpp RuntimeDyldMachO.cpp ) + +add_llvm_library_dependencies(LLVMRuntimeDyld + LLVMObject + LLVMSupport + ) diff --git a/llvm/lib/Linker/CMakeLists.txt b/llvm/lib/Linker/CMakeLists.txt index 0b6d2f4218e3a4bfe8d8621219cfb94e0d4d1d4c..4d8824bfcb3f06567b294e1e5f48807e822c46d3 100644 --- a/llvm/lib/Linker/CMakeLists.txt +++ b/llvm/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 + ) diff --git a/llvm/lib/MC/CMakeLists.txt b/llvm/lib/MC/CMakeLists.txt index 9f0a7e8bca7cfab41420aed3ed7d482185fbc5e2..a3303a1bf24d12652f461fa8c48d629c519fb8f0 100644 --- a/llvm/lib/MC/CMakeLists.txt +++ b/llvm/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) diff --git a/llvm/lib/MC/MCDisassembler/CMakeLists.txt b/llvm/lib/MC/MCDisassembler/CMakeLists.txt index 0ce359d4b533fa0b5820f6fb93dc331a9c65e25d..bb7447ccc012e2305575ee26bad8285230896082 100644 --- a/llvm/lib/MC/MCDisassembler/CMakeLists.txt +++ b/llvm/lib/MC/MCDisassembler/CMakeLists.txt @@ -1,4 +1,3 @@ - add_llvm_library(LLVMMCDisassembler Disassembler.cpp EDDisassembler.cpp @@ -6,3 +5,44 @@ add_llvm_library(LLVMMCDisassembler 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 + ) diff --git a/llvm/lib/MC/MCParser/CMakeLists.txt b/llvm/lib/MC/MCParser/CMakeLists.txt index 222f237bfd6415d04f5abbe79ee274a3d6efd56b..299d28168948e7c93cdcc6fb722751f8951e126f 100644 --- a/llvm/lib/MC/MCParser/CMakeLists.txt +++ b/llvm/lib/MC/MCParser/CMakeLists.txt @@ -9,3 +9,8 @@ add_llvm_library(LLVMMCParser MCAsmParserExtension.cpp MCTargetAsmParser.cpp ) + +add_llvm_library_dependencies(LLVMMCParser + LLVMMC + LLVMSupport + ) diff --git a/llvm/lib/Object/CMakeLists.txt b/llvm/lib/Object/CMakeLists.txt index 68e5e94924d0abff40789ebf4f59466eb572451f..81113934dc993c194f0c6206db0961f79ae49f8c 100644 --- a/llvm/lib/Object/CMakeLists.txt +++ b/llvm/lib/Object/CMakeLists.txt @@ -8,3 +8,8 @@ add_llvm_library(LLVMObject Object.cpp ObjectFile.cpp ) + +add_llvm_library_dependencies(LLVMObject + LLVMCore + LLVMSupport + ) diff --git a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt b/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt index 88393e313a853221df78d650f2c81d46891d6108..3f5ad39debc3130a67f3b664a3ecfa006116935a 100644 --- a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt @@ -4,4 +4,13 @@ add_llvm_library(LLVMARMAsmParser ARMAsmLexer.cpp ARMAsmParser.cpp ) + add_dependencies(LLVMARMAsmParser ARMCommonTableGen) + +add_llvm_library_dependencies(LLVMARMAsmParser + LLVMARMDesc + LLVMARMInfo + LLVMMC + LLVMMCParser + LLVMSupport + ) diff --git a/llvm/lib/Target/ARM/CMakeLists.txt b/llvm/lib/Target/ARM/CMakeLists.txt index 8394be52cd16397fc8a9ab0b36974e31c95bd2df..42b450959f3d69853cb8a4717cf8970a16fb7c09 100644 --- a/llvm/lib/Target/ARM/CMakeLists.txt +++ b/llvm/lib/Target/ARM/CMakeLists.txt @@ -50,6 +50,20 @@ add_llvm_target(ARMCodeGen Thumb2SizeReduction.cpp ) +add_llvm_library_dependencies(LLVMARMCodeGen + LLVMARMAsmPrinter + LLVMARMDesc + LLVMARMInfo + LLVMAnalysis + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMC + LLVMSelectionDAG + LLVMSupport + LLVMTarget + ) + # workaround for hanging compilation on MSVC10 if( MSVC_VERSION EQUAL 1600 ) set_property( diff --git a/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt b/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt index a4238aae54f2a42137f9c081b25c750717092f90..952dab53ec77d5cdc34988202d02781ee840c0ea 100644 --- a/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt @@ -12,3 +12,11 @@ set_property( ) endif() add_dependencies(LLVMARMDisassembler ARMCommonTableGen) + +add_llvm_library_dependencies(LLVMARMDisassembler + LLVMARMCodeGen + LLVMARMDesc + LLVMARMInfo + LLVMMC + LLVMSupport + ) diff --git a/llvm/lib/Target/ARM/InstPrinter/CMakeLists.txt b/llvm/lib/Target/ARM/InstPrinter/CMakeLists.txt index 7b6193aeeff2472dabad9c85fce72067bc6d5bfe..fa0b4957ccdee67a35000e82a46313ebfb4673df 100644 --- a/llvm/lib/Target/ARM/InstPrinter/CMakeLists.txt +++ b/llvm/lib/Target/ARM/InstPrinter/CMakeLists.txt @@ -3,4 +3,10 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMARMAsmPrinter ARMInstPrinter.cpp ) + add_dependencies(LLVMARMAsmPrinter ARMCommonTableGen) + +add_llvm_library_dependencies(LLVMARMAsmPrinter + LLVMMC + LLVMSupport + ) diff --git a/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt index df2cf81be2c51b871321f5d92a5b7bd881ecaafc..83fd641c31af3b54cc0cdf3f19503b334420b296 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt @@ -11,4 +11,9 @@ add_dependencies(LLVMARMDesc ARMCommonTableGen) # Hack: we need to include 'main' target directory to grab private headers include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..) -target_link_libraries(LLVMARMDesc LLVMARMAsmPrinter) +add_llvm_library_dependencies(LLVMARMDesc + LLVMARMInfo + LLVMARMAsmPrinter + LLVMMC + LLVMSupport + ) diff --git a/llvm/lib/Target/ARM/TargetInfo/CMakeLists.txt b/llvm/lib/Target/ARM/TargetInfo/CMakeLists.txt index 3910bb02e219650478fe2a6bd61be0adb59c2e69..3ccd4c3d53aba97ce0b9ac4fd5402c8b8141f43d 100644 --- a/llvm/lib/Target/ARM/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/ARM/TargetInfo/CMakeLists.txt @@ -5,3 +5,9 @@ add_llvm_library(LLVMARMInfo ) add_dependencies(LLVMARMInfo ARMCodeGenTable_gen) + +add_llvm_library_dependencies(LLVMARMInfo + LLVMMC + LLVMSupport + LLVMTarget + ) diff --git a/llvm/lib/Target/Alpha/CMakeLists.txt b/llvm/lib/Target/Alpha/CMakeLists.txt index 5444e1ab0853a1edf2c8324e1e83c423efab71a9..63412c144b0df18f549a5be77d41fbb75b9cfb37 100644 --- a/llvm/lib/Target/Alpha/CMakeLists.txt +++ b/llvm/lib/Target/Alpha/CMakeLists.txt @@ -22,5 +22,17 @@ add_llvm_target(AlphaCodeGen AlphaSelectionDAGInfo.cpp ) +add_llvm_library_dependencies(LLVMAlphaCodeGen + LLVMAlphaDesc + LLVMAlphaInfo + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMC + LLVMSelectionDAG + LLVMSupport + LLVMTarget + ) + add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/Alpha/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/Alpha/MCTargetDesc/CMakeLists.txt index 733b1c01d437d94ce6071035dd775b7f950884ad..f745ecbdb67fba854bd8c3fd88181f07f72a735a 100644 --- a/llvm/lib/Target/Alpha/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/Alpha/MCTargetDesc/CMakeLists.txt @@ -2,4 +2,10 @@ add_llvm_library(LLVMAlphaDesc AlphaMCTargetDesc.cpp AlphaMCAsmInfo.cpp ) + +add_llvm_library_dependencies(LLVMAlphaDesc + LLVMAlphaInfo + LLVMMC + ) + add_dependencies(LLVMAlphaDesc AlphaCommonTableGen) diff --git a/llvm/lib/Target/Alpha/TargetInfo/CMakeLists.txt b/llvm/lib/Target/Alpha/TargetInfo/CMakeLists.txt index a52457d6332873b7ace32c47869ab38bec83d677..cac3178b789d0d4caa813f095eb42bdb1949042d 100644 --- a/llvm/lib/Target/Alpha/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/Alpha/TargetInfo/CMakeLists.txt @@ -3,4 +3,11 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMAlphaInfo AlphaTargetInfo.cpp ) + +add_llvm_library_dependencies(LLVMAlphaInfo + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMAlphaInfo AlphaCommonTableGen) diff --git a/llvm/lib/Target/Blackfin/CMakeLists.txt b/llvm/lib/Target/Blackfin/CMakeLists.txt index e69ffa4a3add77771a3b4b6c5d4426b8b2ed2a51..a0b2e935cfbd8c0fda17442df94f73f0f6dbb26e 100644 --- a/llvm/lib/Target/Blackfin/CMakeLists.txt +++ b/llvm/lib/Target/Blackfin/CMakeLists.txt @@ -22,5 +22,17 @@ add_llvm_target(BlackfinCodeGen BlackfinSelectionDAGInfo.cpp ) +add_llvm_library_dependencies(LLVMBlackfinCodeGen + LLVMAsmPrinter + LLVMBlackfinDesc + LLVMBlackfinInfo + LLVMCodeGen + LLVMCore + LLVMMC + LLVMSelectionDAG + LLVMSupport + LLVMTarget + ) + add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/Blackfin/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/Blackfin/MCTargetDesc/CMakeLists.txt index 7ea79b498e13105dd0de3092f3101e59c8a3707e..73315d852cbda9d403c77a5f904bc22a8dd98bc6 100644 --- a/llvm/lib/Target/Blackfin/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/Blackfin/MCTargetDesc/CMakeLists.txt @@ -2,4 +2,10 @@ add_llvm_library(LLVMBlackfinDesc BlackfinMCTargetDesc.cpp BlackfinMCAsmInfo.cpp ) + +add_llvm_library_dependencies(LLVMBlackfinDesc + LLVMBlackfinInfo + LLVMMC + ) + add_dependencies(LLVMBlackfinDesc BlackfinCommonTableGen) diff --git a/llvm/lib/Target/Blackfin/TargetInfo/CMakeLists.txt b/llvm/lib/Target/Blackfin/TargetInfo/CMakeLists.txt index 5ca80604f63cdbfba49a91e68532b9c123c0810d..73faf1bcd31aaa7e7df0c16a1d918b90ae978260 100644 --- a/llvm/lib/Target/Blackfin/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/Blackfin/TargetInfo/CMakeLists.txt @@ -4,4 +4,10 @@ add_llvm_library(LLVMBlackfinInfo BlackfinTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMBlackfinInfo + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMBlackfinInfo BlackfinCodeGenTable_gen) diff --git a/llvm/lib/Target/CBackend/CMakeLists.txt b/llvm/lib/Target/CBackend/CMakeLists.txt index a23ff852970318d45c4f222883021749fbe458ad..96ae49f01fc0710ff8477c2680530557f8004650 100644 --- a/llvm/lib/Target/CBackend/CMakeLists.txt +++ b/llvm/lib/Target/CBackend/CMakeLists.txt @@ -2,4 +2,16 @@ add_llvm_target(CBackend CBackend.cpp ) +add_llvm_library_dependencies(LLVMCBackend + LLVMAnalysis + LLVMCBackendInfo + LLVMCodeGen + LLVMCore + LLVMMC + LLVMScalarOpts + LLVMSupport + LLVMTarget + LLVMTransformUtils + ) + add_subdirectory(TargetInfo) diff --git a/llvm/lib/Target/CBackend/TargetInfo/CMakeLists.txt b/llvm/lib/Target/CBackend/TargetInfo/CMakeLists.txt index 5b35fa7c065b31770cfc57658dc89e44b65d00f0..8e616bebd5320903d256a2502570994b781b9ebb 100644 --- a/llvm/lib/Target/CBackend/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/CBackend/TargetInfo/CMakeLists.txt @@ -4,3 +4,8 @@ add_llvm_library(LLVMCBackendInfo CBackendTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMCBackendInfo + LLVMMC + LLVMSupport + LLVMTarget + ) diff --git a/llvm/lib/Target/CMakeLists.txt b/llvm/lib/Target/CMakeLists.txt index d91940aea4431c939693b60ff27f11fa5ff16255..6620882f227938c9908a04eb565e57df4255e97b 100644 --- a/llvm/lib/Target/CMakeLists.txt +++ b/llvm/lib/Target/CMakeLists.txt @@ -14,6 +14,12 @@ add_llvm_library(LLVMTarget TargetSubtargetInfo.cpp ) +add_llvm_library_dependencies(LLVMTarget + LLVMCore + LLVMMC + LLVMSupport + ) + set(LLVM_ENUM_ASM_PRINTERS "") set(LLVM_ENUM_ASM_PARSERS "") set(LLVM_ENUM_DISASSEMBLERS "") diff --git a/llvm/lib/Target/CellSPU/CMakeLists.txt b/llvm/lib/Target/CellSPU/CMakeLists.txt index 20ecb9b60e405450efab1d10aa049067c3e9f3c0..c16e53cdfe4978d3d632703fe1aacb2e77681a49 100644 --- a/llvm/lib/Target/CellSPU/CMakeLists.txt +++ b/llvm/lib/Target/CellSPU/CMakeLists.txt @@ -23,5 +23,17 @@ add_llvm_target(CellSPUCodeGen SPUNopFiller.cpp ) +add_llvm_library_dependencies(LLVMCellSPUCodeGen + LLVMAsmPrinter + LLVMCellSPUDesc + LLVMCellSPUInfo + LLVMCodeGen + LLVMCore + LLVMMC + LLVMSelectionDAG + LLVMSupport + LLVMTarget + ) + add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/CellSPU/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/CellSPU/MCTargetDesc/CMakeLists.txt index 7435e93fe0387893d82c42433037a8ad657c1340..d41fe934e2c5c85b39736837549af3f6e1627a23 100644 --- a/llvm/lib/Target/CellSPU/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/CellSPU/MCTargetDesc/CMakeLists.txt @@ -2,4 +2,10 @@ add_llvm_library(LLVMCellSPUDesc SPUMCTargetDesc.cpp SPUMCAsmInfo.cpp ) + +add_llvm_library_dependencies(LLVMCellSPUDesc + LLVMCellSPUInfo + LLVMMC + ) + add_dependencies(LLVMCellSPUDesc CellSPUCommonTableGen) diff --git a/llvm/lib/Target/CellSPU/TargetInfo/CMakeLists.txt b/llvm/lib/Target/CellSPU/TargetInfo/CMakeLists.txt index 928d0fe97e0d23eba0f8c7b04663abe0114035f6..4e0785a6d851dfdbf3fd1195eff4cd43de563b4a 100644 --- a/llvm/lib/Target/CellSPU/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/CellSPU/TargetInfo/CMakeLists.txt @@ -4,4 +4,10 @@ add_llvm_library(LLVMCellSPUInfo CellSPUTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMCellSPUInfo + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMCellSPUInfo CellSPUCodeGenTable_gen) diff --git a/llvm/lib/Target/CppBackend/CMakeLists.txt b/llvm/lib/Target/CppBackend/CMakeLists.txt index e9375599511cd9c81c7122d9ae3bcce2f38a251c..95b6058243dceca044854f8d5384a742ecde8c1c 100644 --- a/llvm/lib/Target/CppBackend/CMakeLists.txt +++ b/llvm/lib/Target/CppBackend/CMakeLists.txt @@ -2,4 +2,11 @@ add_llvm_target(CppBackend CPPBackend.cpp ) +add_llvm_library_dependencies(LLVMCppBackend + LLVMCore + LLVMCppBackendInfo + LLVMSupport + LLVMTarget + ) + add_subdirectory(TargetInfo) diff --git a/llvm/lib/Target/CppBackend/TargetInfo/CMakeLists.txt b/llvm/lib/Target/CppBackend/TargetInfo/CMakeLists.txt index edaf5d3cb18863b410cc4bd4880b181ced484d76..7165d8fdf2cd98c44474ed8b61838bb664a0f488 100644 --- a/llvm/lib/Target/CppBackend/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/CppBackend/TargetInfo/CMakeLists.txt @@ -4,3 +4,7 @@ add_llvm_library(LLVMCppBackendInfo CppBackendTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMCppBackendInfo + LLVMMC + LLVMTarget + ) diff --git a/llvm/lib/Target/MBlaze/AsmParser/CMakeLists.txt b/llvm/lib/Target/MBlaze/AsmParser/CMakeLists.txt index 18870cd1cf37830d5db9727532cb84612b72f281..ec8f52a92cb1e9eaa2f6216467d97ef4503b4753 100644 --- a/llvm/lib/Target/MBlaze/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/MBlaze/AsmParser/CMakeLists.txt @@ -5,5 +5,12 @@ add_llvm_library(LLVMMBlazeAsmParser MBlazeAsmLexer.cpp MBlazeAsmParser.cpp ) -add_dependencies(LLVMMBlazeAsmParser MBlazeCommonTableGen) +add_llvm_library_dependencies(LLVMMBlazeAsmParser + LLVMMBlazeInfo + LLVMMC + LLVMMCParser + LLVMSupport + ) + +add_dependencies(LLVMMBlazeAsmParser MBlazeCommonTableGen) diff --git a/llvm/lib/Target/MBlaze/CMakeLists.txt b/llvm/lib/Target/MBlaze/CMakeLists.txt index ae0eca96a2a9d7e6f99f53ed7031ac23c28d43ba..20b3b036b0a54ce79310162bc6b44dc805ee38d7 100644 --- a/llvm/lib/Target/MBlaze/CMakeLists.txt +++ b/llvm/lib/Target/MBlaze/CMakeLists.txt @@ -29,6 +29,19 @@ add_llvm_target(MBlazeCodeGen MBlazeELFWriterInfo.cpp ) +add_llvm_library_dependencies(LLVMMBlazeCodeGen + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMBlazeAsmPrinter + LLVMMBlazeDesc + LLVMMBlazeInfo + LLVMMC + LLVMSelectionDAG + LLVMSupport + LLVMTarget + ) + add_subdirectory(AsmParser) add_subdirectory(Disassembler) add_subdirectory(InstPrinter) diff --git a/llvm/lib/Target/MBlaze/Disassembler/CMakeLists.txt b/llvm/lib/Target/MBlaze/Disassembler/CMakeLists.txt index be2dce156d56080ddd54c90800f5c5f2d0d4af7d..112c64c026381eadac9a06643af62b6271730e5a 100644 --- a/llvm/lib/Target/MBlaze/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/MBlaze/Disassembler/CMakeLists.txt @@ -13,4 +13,12 @@ set_property( ) endif() +add_llvm_library_dependencies(LLVMMBlazeDisassembler + LLVMMBlazeCodeGen + LLVMMBlazeDesc + LLVMMBlazeInfo + LLVMMC + LLVMSupport + ) + add_dependencies(LLVMMBlazeDisassembler MBlazeCommonTableGen) diff --git a/llvm/lib/Target/MBlaze/InstPrinter/CMakeLists.txt b/llvm/lib/Target/MBlaze/InstPrinter/CMakeLists.txt index 138a4e36349a26ea3747cc67974e73f9fa99dcd4..aff0b3d992d4cbabe44c88d393aad193a78c96d7 100644 --- a/llvm/lib/Target/MBlaze/InstPrinter/CMakeLists.txt +++ b/llvm/lib/Target/MBlaze/InstPrinter/CMakeLists.txt @@ -2,7 +2,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) add_llvm_library(LLVMMBlazeAsmPrinter - MBlazeInstPrinter.cpp + MBlazeInstPrinter.cpp + ) + +add_llvm_library_dependencies(LLVMMBlazeAsmPrinter + LLVMMC + LLVMSupport ) add_dependencies(LLVMMBlazeAsmPrinter MBlazeCommonTableGen) diff --git a/llvm/lib/Target/MBlaze/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/MBlaze/MCTargetDesc/CMakeLists.txt index 247dfe884ea91ce105226c08d3510f9ee9e320ad..37871b6916c9f0d8760b88af73494a2ae0ca9634 100644 --- a/llvm/lib/Target/MBlaze/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/MBlaze/MCTargetDesc/CMakeLists.txt @@ -4,6 +4,12 @@ add_llvm_library(LLVMMBlazeDesc MBlazeMCCodeEmitter.cpp MBlazeMCTargetDesc.cpp ) -add_dependencies(LLVMMBlazeDesc MBlazeCommonTableGen) -target_link_libraries(LLVMMBlazeDesc LLVMMBlazeAsmPrinter) +add_llvm_library_dependencies(LLVMMBlazeDesc + LLVMMBlazeAsmPrinter + LLVMMBlazeInfo + LLVMMC + LLVMSupport + ) + +add_dependencies(LLVMMBlazeDesc MBlazeCommonTableGen) diff --git a/llvm/lib/Target/MBlaze/TargetInfo/CMakeLists.txt b/llvm/lib/Target/MBlaze/TargetInfo/CMakeLists.txt index 40696f63c462a5640c5dd7f868142bbcfa53d262..3425334d05508d489defe5527431d1704dfc8e58 100644 --- a/llvm/lib/Target/MBlaze/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/MBlaze/TargetInfo/CMakeLists.txt @@ -5,4 +5,10 @@ add_llvm_library(LLVMMBlazeInfo MBlazeTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMMBlazeInfo + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMMBlazeInfo MBlazeCodeGenTable_gen) diff --git a/llvm/lib/Target/MSP430/CMakeLists.txt b/llvm/lib/Target/MSP430/CMakeLists.txt index 3b6cf89d1ff33c9b92d45b4bd9815c31b8137af5..3840b03b9783ac427799c5beeaa6130e9dbfff03 100644 --- a/llvm/lib/Target/MSP430/CMakeLists.txt +++ b/llvm/lib/Target/MSP430/CMakeLists.txt @@ -22,6 +22,19 @@ add_llvm_target(MSP430CodeGen MSP430MCInstLower.cpp ) +add_llvm_library_dependencies(LLVMMSP430CodeGen + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMC + LLVMMSP430AsmPrinter + LLVMMSP430Desc + LLVMMSP430Info + LLVMSelectionDAG + LLVMSupport + LLVMTarget + ) + add_subdirectory(InstPrinter) add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/MSP430/InstPrinter/CMakeLists.txt b/llvm/lib/Target/MSP430/InstPrinter/CMakeLists.txt index 5ad01456a445f127b90f73f08309ca8d1b1e650c..ce39d9517efe15639df20fb0fed3c8cb8862c810 100644 --- a/llvm/lib/Target/MSP430/InstPrinter/CMakeLists.txt +++ b/llvm/lib/Target/MSP430/InstPrinter/CMakeLists.txt @@ -3,4 +3,10 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMMSP430AsmPrinter MSP430InstPrinter.cpp ) + +add_llvm_library_dependencies(LLVMMSP430AsmPrinter + LLVMMC + LLVMSupport + ) + add_dependencies(LLVMMSP430AsmPrinter MSP430CommonTableGen) diff --git a/llvm/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt index 45b9ae8895446769573a33cd8f1612d1bc72be50..04bd03e494604cf71c209e4b41f2f33fc440dd7f 100644 --- a/llvm/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt @@ -2,6 +2,11 @@ add_llvm_library(LLVMMSP430Desc MSP430MCTargetDesc.cpp MSP430MCAsmInfo.cpp ) -add_dependencies(LLVMMSP430Desc MSP430CommonTableGen) -target_link_libraries(LLVMMSP430Desc LLVMMSP430AsmPrinter) +add_llvm_library_dependencies(LLVMMSP430Desc + LLVMMC + LLVMMSP430AsmPrinter + LLVMMSP430Info + ) + +add_dependencies(LLVMMSP430Desc MSP430CommonTableGen) diff --git a/llvm/lib/Target/MSP430/TargetInfo/CMakeLists.txt b/llvm/lib/Target/MSP430/TargetInfo/CMakeLists.txt index 2d1aa9d4e5e76266ce19979b011b27a66e7bfbd9..40f002313d5cab45af641e6b1879aa2bb7c3867d 100644 --- a/llvm/lib/Target/MSP430/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/MSP430/TargetInfo/CMakeLists.txt @@ -4,4 +4,10 @@ add_llvm_library(LLVMMSP430Info MSP430TargetInfo.cpp ) +add_llvm_library_dependencies(LLVMMSP430Info + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMMSP430Info MSP430CodeGenTable_gen) diff --git a/llvm/lib/Target/Mips/CMakeLists.txt b/llvm/lib/Target/Mips/CMakeLists.txt index 192ff1c93feefa5f1153d7c138fcaaf8395ea0a9..9daa89e54fd2c619c0a9105a094121c8937559f5 100644 --- a/llvm/lib/Target/Mips/CMakeLists.txt +++ b/llvm/lib/Target/Mips/CMakeLists.txt @@ -28,6 +28,19 @@ add_llvm_target(MipsCodeGen MipsSelectionDAGInfo.cpp ) +add_llvm_library_dependencies(LLVMMipsCodeGen + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMC + LLVMMipsAsmPrinter + LLVMMipsDesc + LLVMMipsInfo + LLVMSelectionDAG + LLVMSupport + LLVMTarget + ) + add_subdirectory(InstPrinter) add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/Mips/InstPrinter/CMakeLists.txt b/llvm/lib/Target/Mips/InstPrinter/CMakeLists.txt index e64d511f073ab99cf0d930ad32cf73d2d6789058..c45b35df8c115a5bd3f6af566a79dc1d1d46032e 100644 --- a/llvm/lib/Target/Mips/InstPrinter/CMakeLists.txt +++ b/llvm/lib/Target/Mips/InstPrinter/CMakeLists.txt @@ -3,4 +3,10 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMMipsAsmPrinter MipsInstPrinter.cpp ) + +add_llvm_library_dependencies(LLVMMipsAsmPrinter + LLVMMC + LLVMSupport + ) + add_dependencies(LLVMMipsAsmPrinter MipsCommonTableGen) diff --git a/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt index 98760c5cd25efc7d08af18c9d1521bbcbe81e370..bb8aab1e64e6c2933ef1d0864ee5cad3c959cf03 100644 --- a/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt @@ -2,6 +2,12 @@ add_llvm_library(LLVMMipsDesc MipsMCTargetDesc.cpp MipsMCAsmInfo.cpp ) -add_dependencies(LLVMMipsDesc MipsCommonTableGen) -target_link_libraries(LLVMMipsDesc LLVMMipsAsmPrinter) +add_llvm_library_dependencies(LLVMMipsDesc + LLVMMC + LLVMMipsAsmPrinter + LLVMMipsInfo + LLVMSupport + ) + +add_dependencies(LLVMMipsDesc MipsCommonTableGen) diff --git a/llvm/lib/Target/Mips/TargetInfo/CMakeLists.txt b/llvm/lib/Target/Mips/TargetInfo/CMakeLists.txt index 6e5d56ba4ae785e2053c7dcf9f2d797bd58149b3..32240e09dd419176681a926a63f09f86e1a51458 100644 --- a/llvm/lib/Target/Mips/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/Mips/TargetInfo/CMakeLists.txt @@ -4,4 +4,10 @@ add_llvm_library(LLVMMipsInfo MipsTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMMipsInfo + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMMipsInfo MipsCodeGenTable_gen) diff --git a/llvm/lib/Target/PTX/CMakeLists.txt b/llvm/lib/Target/PTX/CMakeLists.txt index 1eafb660303378e73c2f33f109f6e638b1effc43..bfbbe87281b112da7a5f1aa17eef7c72c6624cb2 100644 --- a/llvm/lib/Target/PTX/CMakeLists.txt +++ b/llvm/lib/Target/PTX/CMakeLists.txt @@ -21,5 +21,18 @@ add_llvm_target(PTXCodeGen PTXTargetMachine.cpp ) +add_llvm_library_dependencies(LLVMPTXCodeGen + LLVMAnalysis + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMC + LLVMPTXDesc + LLVMPTXInfo + LLVMSelectionDAG + LLVMSupport + LLVMTarget + ) + add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/PTX/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/PTX/MCTargetDesc/CMakeLists.txt index ad787321e4823d4fb91db71b4119c47c44c450c7..ddf082590310c2df877a2a8ec94810c9e856f962 100644 --- a/llvm/lib/Target/PTX/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/PTX/MCTargetDesc/CMakeLists.txt @@ -2,4 +2,11 @@ add_llvm_library(LLVMPTXDesc PTXMCTargetDesc.cpp PTXMCAsmInfo.cpp ) + +add_llvm_library_dependencies(LLVMPTXDesc + LLVMMC + LLVMPTXInfo + LLVMSupport + ) + add_dependencies(LLVMPTXDesc PTXCommonTableGen) diff --git a/llvm/lib/Target/PTX/TargetInfo/CMakeLists.txt b/llvm/lib/Target/PTX/TargetInfo/CMakeLists.txt index 4b09cf5ce0995fb8f08d740f5db27d11fdb1500c..8b399dfb5d13bacab06eaac192870d0706e167f6 100644 --- a/llvm/lib/Target/PTX/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/PTX/TargetInfo/CMakeLists.txt @@ -4,4 +4,10 @@ add_llvm_library(LLVMPTXInfo PTXTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMPTXInfo + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMPTXInfo PTXCodeGenTable_gen) diff --git a/llvm/lib/Target/PowerPC/CMakeLists.txt b/llvm/lib/Target/PowerPC/CMakeLists.txt index 563a0bd95c1bf14936305fe9ff5c6f166bf39725..ec0a9186f2719324f237b486dd13218f42a8a2b0 100644 --- a/llvm/lib/Target/PowerPC/CMakeLists.txt +++ b/llvm/lib/Target/PowerPC/CMakeLists.txt @@ -27,6 +27,20 @@ add_llvm_target(PowerPCCodeGen PPCSelectionDAGInfo.cpp ) +add_llvm_library_dependencies(LLVMPowerPCCodeGen + LLVMAnalysis + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMC + LLVMPowerPCAsmPrinter + LLVMPowerPCDesc + LLVMPowerPCInfo + LLVMSelectionDAG + LLVMSupport + LLVMTarget + ) + add_subdirectory(InstPrinter) add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/PowerPC/InstPrinter/CMakeLists.txt b/llvm/lib/Target/PowerPC/InstPrinter/CMakeLists.txt index dfdc277361468777b2c7d3c77eb611220225f960..1d857e2f48d44cb48dcb9337bdcd1a6334972148 100644 --- a/llvm/lib/Target/PowerPC/InstPrinter/CMakeLists.txt +++ b/llvm/lib/Target/PowerPC/InstPrinter/CMakeLists.txt @@ -3,4 +3,10 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMPowerPCAsmPrinter PPCInstPrinter.cpp ) + +add_llvm_library_dependencies(LLVMPowerPCAsmPrinter + LLVMMC + LLVMSupport + ) + add_dependencies(LLVMPowerPCAsmPrinter PowerPCCommonTableGen) diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt index 78e7ab5a808a524100ab373b5b48a4bee6c9122a..c4041db8cf0bc99fec362ae33ba0117912b70550 100644 --- a/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt @@ -5,6 +5,12 @@ add_llvm_library(LLVMPowerPCDesc PPCMCCodeEmitter.cpp PPCPredicates.cpp ) -add_dependencies(LLVMPowerPCDesc PowerPCCommonTableGen) -target_link_libraries(LLVMPowerPCDesc LLVMPowerPCAsmPrinter) +add_llvm_library_dependencies(LLVMPowerPCDesc + LLVMMC + LLVMPowerPCAsmPrinter + LLVMPowerPCInfo + LLVMSupport + ) + +add_dependencies(LLVMPowerPCDesc PowerPCCommonTableGen) diff --git a/llvm/lib/Target/PowerPC/TargetInfo/CMakeLists.txt b/llvm/lib/Target/PowerPC/TargetInfo/CMakeLists.txt index 058d599a4af06028e6f07c7dcb874bd5e256fc5d..aab91ae0360861c4c19e5f823e5cbd50fe7ea44c 100644 --- a/llvm/lib/Target/PowerPC/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/PowerPC/TargetInfo/CMakeLists.txt @@ -4,4 +4,10 @@ add_llvm_library(LLVMPowerPCInfo PowerPCTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMPowerPCInfo + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMPowerPCInfo PowerPCCodeGenTable_gen) diff --git a/llvm/lib/Target/Sparc/CMakeLists.txt b/llvm/lib/Target/Sparc/CMakeLists.txt index 32bc421f0b83c3b8a613e089be89d64237ea1f19..0491229f61ac11b9119fbd2c62a1b2ae7c961a7b 100644 --- a/llvm/lib/Target/Sparc/CMakeLists.txt +++ b/llvm/lib/Target/Sparc/CMakeLists.txt @@ -22,5 +22,17 @@ add_llvm_target(SparcCodeGen SparcSelectionDAGInfo.cpp ) +add_llvm_library_dependencies(LLVMSparcCodeGen + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMC + LLVMSelectionDAG + LLVMSparcDesc + LLVMSparcInfo + LLVMSupport + LLVMTarget + ) + add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt index a0525b6723182c7ccb7fa9529e694e6cf7466e28..d3bdf0b503aebde79c0b41fc88dbbc346dc431c6 100644 --- a/llvm/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt @@ -2,4 +2,11 @@ add_llvm_library(LLVMSparcDesc SparcMCTargetDesc.cpp SparcMCAsmInfo.cpp ) + +add_llvm_library_dependencies(LLVMSparcDesc + LLVMMC + LLVMSparcInfo + LLVMSupport + ) + add_dependencies(LLVMSparcDesc SparcCommonTableGen) diff --git a/llvm/lib/Target/Sparc/TargetInfo/CMakeLists.txt b/llvm/lib/Target/Sparc/TargetInfo/CMakeLists.txt index 870b56a6ea1be2b3744a4f4d7da8a9e779ef5d34..e2dabb174901c4b1e7f9b520e0f2396749b45eea 100644 --- a/llvm/lib/Target/Sparc/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/Sparc/TargetInfo/CMakeLists.txt @@ -4,4 +4,10 @@ add_llvm_library(LLVMSparcInfo SparcTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMSparcInfo + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMSparcInfo SparcCodeGenTable_gen) diff --git a/llvm/lib/Target/SystemZ/CMakeLists.txt b/llvm/lib/Target/SystemZ/CMakeLists.txt index bd8238ecac5d8a5bd64b6318c0fc387f9e4f6223..41b4c78bee22e19b4690b47c03d16558d3714a96 100644 --- a/llvm/lib/Target/SystemZ/CMakeLists.txt +++ b/llvm/lib/Target/SystemZ/CMakeLists.txt @@ -20,5 +20,17 @@ add_llvm_target(SystemZCodeGen SystemZSelectionDAGInfo.cpp ) +add_llvm_library_dependencies(LLVMSystemZCodeGen + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMC + LLVMSelectionDAG + LLVMSupport + LLVMSystemZDesc + LLVMSystemZInfo + LLVMTarget + ) + add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt index 612a94ec92ba5689e259c06c027c84006ec57b7e..822df097a37d639370cc4a3a8097abcf552033ce 100644 --- a/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt @@ -2,6 +2,12 @@ add_llvm_library(LLVMSystemZDesc SystemZMCTargetDesc.cpp SystemZMCAsmInfo.cpp ) + +add_llvm_library_dependencies(LLVMSystemZDesc + LLVMMC + LLVMSystemZInfo + ) + add_dependencies(LLVMSystemZDesc SystemZCommonTableGen) # Hack: we need to include 'main' target directory to grab private headers diff --git a/llvm/lib/Target/SystemZ/TargetInfo/CMakeLists.txt b/llvm/lib/Target/SystemZ/TargetInfo/CMakeLists.txt index 743d8d322d054564fc89988bf43b8afcc0612d00..12045bdc4d2c9712672a9ce4c0d501462059d8e0 100644 --- a/llvm/lib/Target/SystemZ/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/SystemZ/TargetInfo/CMakeLists.txt @@ -4,4 +4,10 @@ add_llvm_library(LLVMSystemZInfo SystemZTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMSystemZInfo + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMSystemZInfo SystemZCodeGenTable_gen) diff --git a/llvm/lib/Target/X86/AsmParser/CMakeLists.txt b/llvm/lib/Target/X86/AsmParser/CMakeLists.txt index 78b16f7cd34d94131b01c36171a0728e33c7ba2f..94aca7abb2bdf8a1481152e62b826fa31d6ec279 100644 --- a/llvm/lib/Target/X86/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/X86/AsmParser/CMakeLists.txt @@ -4,4 +4,13 @@ add_llvm_library(LLVMX86AsmParser X86AsmLexer.cpp X86AsmParser.cpp ) + +add_llvm_library_dependencies(LLVMX86AsmParser + LLVMMC + LLVMMCParser + LLVMSupport + LLVMX86Desc + LLVMX86Info + ) + add_dependencies(LLVMX86AsmParser X86CommonTableGen) diff --git a/llvm/lib/Target/X86/CMakeLists.txt b/llvm/lib/Target/X86/CMakeLists.txt index 60d3e26ccf778d86f2ae94ac874b3ff30febac34..1fd55128e224dc60341941001b62974183cd552b 100644 --- a/llvm/lib/Target/X86/CMakeLists.txt +++ b/llvm/lib/Target/X86/CMakeLists.txt @@ -51,6 +51,19 @@ endif() add_llvm_target(X86CodeGen ${sources}) +add_llvm_library_dependencies(LLVMX86CodeGen + LLVMAnalysis + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMC + LLVMSelectionDAG + LLVMSupport + LLVMTarget + LLVMX86AsmPrinter + LLVMX86Desc + ) + add_subdirectory(AsmParser) add_subdirectory(Disassembler) add_subdirectory(InstPrinter) diff --git a/llvm/lib/Target/X86/Disassembler/CMakeLists.txt b/llvm/lib/Target/X86/Disassembler/CMakeLists.txt index 240f9b574899b5643d0cc8f34ab40ce4d03fe379..4f570d56e60f095b4268b7f855105b2921d0a125 100644 --- a/llvm/lib/Target/X86/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/X86/Disassembler/CMakeLists.txt @@ -4,6 +4,13 @@ add_llvm_library(LLVMX86Disassembler X86Disassembler.cpp X86DisassemblerDecoder.c ) + +add_llvm_library_dependencies(LLVMX86Disassembler + LLVMMC + LLVMSupport + LLVMX86Info + ) + # workaround for hanging compilation on MSVC9 and 10 if( MSVC_VERSION EQUAL 1400 OR MSVC_VERSION EQUAL 1500 OR MSVC_VERSION EQUAL 1600 ) set_property( @@ -11,4 +18,5 @@ set_property( PROPERTY COMPILE_FLAGS "/Od" ) endif() + add_dependencies(LLVMX86Disassembler X86CommonTableGen) diff --git a/llvm/lib/Target/X86/InstPrinter/CMakeLists.txt b/llvm/lib/Target/X86/InstPrinter/CMakeLists.txt index 3be627a1f0ec18c04171fdde69fa28a5c9c5475c..2a2b5dbb43db67cde7567772efa938a362b87be5 100644 --- a/llvm/lib/Target/X86/InstPrinter/CMakeLists.txt +++ b/llvm/lib/Target/X86/InstPrinter/CMakeLists.txt @@ -5,4 +5,11 @@ add_llvm_library(LLVMX86AsmPrinter X86IntelInstPrinter.cpp X86InstComments.cpp ) + +add_llvm_library_dependencies(LLVMX86AsmPrinter + LLVMMC + LLVMSupport + LLVMX86Utils + ) + add_dependencies(LLVMX86AsmPrinter X86CommonTableGen) diff --git a/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt index 4e7995d76b82a7a3edcd6045fa6b212538a6827e..87219120e2a82b8d33fb1edbb81443cfa3ddb86c 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt @@ -5,9 +5,16 @@ add_llvm_library(LLVMX86Desc X86MCCodeEmitter.cpp X86MachObjectWriter.cpp ) + +add_llvm_library_dependencies(LLVMX86Desc + LLVMMC + LLVMSupport + LLVMX86AsmPrinter + LLVMX86AsmPrinter + LLVMX86Info + ) + add_dependencies(LLVMX86Desc X86CommonTableGen) # Hack: we need to include 'main' target directory to grab private headers include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..) - -target_link_libraries(LLVMX86Desc LLVMX86AsmPrinter) diff --git a/llvm/lib/Target/X86/TargetInfo/CMakeLists.txt b/llvm/lib/Target/X86/TargetInfo/CMakeLists.txt index 90be9f58cc73ff090691f330184904a1720875b4..8611c407005a8f40584aa70dbeec508a6c1098f4 100644 --- a/llvm/lib/Target/X86/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/X86/TargetInfo/CMakeLists.txt @@ -4,4 +4,10 @@ add_llvm_library(LLVMX86Info X86TargetInfo.cpp ) +add_llvm_library_dependencies(LLVMX86Info + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMX86Info X86CodeGenTable_gen) diff --git a/llvm/lib/Target/X86/Utils/CMakeLists.txt b/llvm/lib/Target/X86/Utils/CMakeLists.txt index 3ad5f991c8653b1ea74ffdea267e5d36eb074e99..30ed60bb4b4fe6dbb2411448ace244b773b4f5d6 100644 --- a/llvm/lib/Target/X86/Utils/CMakeLists.txt +++ b/llvm/lib/Target/X86/Utils/CMakeLists.txt @@ -3,4 +3,10 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMX86Utils X86ShuffleDecode.cpp ) + +add_llvm_library_dependencies(LLVMX86Utils + LLVMCore + LLVMSupport + ) + add_dependencies(LLVMX86Utils X86CodeGenTable_gen) diff --git a/llvm/lib/Target/XCore/CMakeLists.txt b/llvm/lib/Target/XCore/CMakeLists.txt index aa4c45bdf1a98a3db6bca80009abca264a8a32fe..dce6e32b6f8625563d5af6f497037446e19716be 100644 --- a/llvm/lib/Target/XCore/CMakeLists.txt +++ b/llvm/lib/Target/XCore/CMakeLists.txt @@ -21,5 +21,17 @@ add_llvm_target(XCoreCodeGen XCoreSelectionDAGInfo.cpp ) +add_llvm_library_dependencies(LLVMXCoreCodeGen + LLVMAsmPrinter + LLVMCodeGen + LLVMCore + LLVMMC + LLVMSelectionDAG + LLVMSupport + LLVMTarget + LLVMXCoreDesc + LLVMXCoreInfo + ) + add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/XCore/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/XCore/MCTargetDesc/CMakeLists.txt index 4a69922f6248a950f50c7f09a5576e8a62fff400..269822db7113b86f28bf388c6428aa8aab2f42d1 100644 --- a/llvm/lib/Target/XCore/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/XCore/MCTargetDesc/CMakeLists.txt @@ -2,6 +2,12 @@ add_llvm_library(LLVMXCoreDesc XCoreMCTargetDesc.cpp XCoreMCAsmInfo.cpp ) + +add_llvm_library_dependencies(LLVMXCoreDesc + LLVMMC + LLVMXCoreInfo + ) + add_dependencies(LLVMXCoreDesc XCoreCommonTableGen) # Hack: we need to include 'main' target directory to grab private headers diff --git a/llvm/lib/Target/XCore/TargetInfo/CMakeLists.txt b/llvm/lib/Target/XCore/TargetInfo/CMakeLists.txt index c147b8a66bc3346da0277f5838bca978458bcdc6..b2d33499fbf9377a769723ad38457f2f6c7663eb 100644 --- a/llvm/lib/Target/XCore/TargetInfo/CMakeLists.txt +++ b/llvm/lib/Target/XCore/TargetInfo/CMakeLists.txt @@ -4,4 +4,10 @@ add_llvm_library(LLVMXCoreInfo XCoreTargetInfo.cpp ) +add_llvm_library_dependencies(LLVMXCoreInfo + LLVMMC + LLVMSupport + LLVMTarget + ) + add_dependencies(LLVMXCoreInfo XCoreCodeGenTable_gen) diff --git a/llvm/lib/Transforms/IPO/CMakeLists.txt b/llvm/lib/Transforms/IPO/CMakeLists.txt index 3de7bfceed1bce7221fe7ede49b73a1d0f721976..d476cccf18799cfd973dcc77e43be7d5fc0d510e 100644 --- a/llvm/lib/Transforms/IPO/CMakeLists.txt +++ b/llvm/lib/Transforms/IPO/CMakeLists.txt @@ -20,3 +20,13 @@ add_llvm_library(LLVMipo StripDeadPrototypes.cpp StripSymbols.cpp ) + +add_llvm_library_dependencies(LLVMipo + LLVMAnalysis + LLVMCore + LLVMScalarOpts + LLVMSupport + LLVMTarget + LLVMTransformUtils + LLVMipa + ) diff --git a/llvm/lib/Transforms/InstCombine/CMakeLists.txt b/llvm/lib/Transforms/InstCombine/CMakeLists.txt index d070ccc0d63fb21f55f3d1664ebbfd6a2a5fae9d..a46d5adc0ab40adb12f3283f2142f766cf32cbfc 100644 --- a/llvm/lib/Transforms/InstCombine/CMakeLists.txt +++ b/llvm/lib/Transforms/InstCombine/CMakeLists.txt @@ -13,3 +13,11 @@ add_llvm_library(LLVMInstCombine InstCombineSimplifyDemanded.cpp InstCombineVectorOps.cpp ) + +add_llvm_library_dependencies(LLVMInstCombine + LLVMAnalysis + LLVMCore + LLVMSupport + LLVMTarget + LLVMTransformUtils + ) diff --git a/llvm/lib/Transforms/Instrumentation/CMakeLists.txt b/llvm/lib/Transforms/Instrumentation/CMakeLists.txt index 5700ac87f6591dcd2980aec9f09f606a51dd4f59..7b3a927a4e685f1da610a96b97c85aca0f64d32a 100644 --- a/llvm/lib/Transforms/Instrumentation/CMakeLists.txt +++ b/llvm/lib/Transforms/Instrumentation/CMakeLists.txt @@ -6,3 +6,10 @@ add_llvm_library(LLVMInstrumentation PathProfiling.cpp ProfilingUtils.cpp ) + +add_llvm_library_dependencies(LLVMInstrumentation + LLVMAnalysis + LLVMCore + LLVMSupport + LLVMTransformUtils + ) diff --git a/llvm/lib/Transforms/Scalar/CMakeLists.txt b/llvm/lib/Transforms/Scalar/CMakeLists.txt index c223da60e0fa23d227b6e0d5f069bfa404a0da9b..728f9fb2d2c3c9859409750451b9cc973aca62ac 100644 --- a/llvm/lib/Transforms/Scalar/CMakeLists.txt +++ b/llvm/lib/Transforms/Scalar/CMakeLists.txt @@ -32,3 +32,12 @@ add_llvm_library(LLVMScalarOpts TailDuplication.cpp TailRecursionElimination.cpp ) + +add_llvm_library_dependencies(LLVMScalarOpts + LLVMAnalysis + LLVMCore + LLVMInstCombine + LLVMSupport + LLVMTarget + LLVMTransformUtils + ) diff --git a/llvm/lib/Transforms/Utils/CMakeLists.txt b/llvm/lib/Transforms/Utils/CMakeLists.txt index 204c2c63e1a590e6d78ae7503b24d7e7b121b4eb..8b944096e7628ea73bb781da15599df0197d4722 100644 --- a/llvm/lib/Transforms/Utils/CMakeLists.txt +++ b/llvm/lib/Transforms/Utils/CMakeLists.txt @@ -27,3 +27,10 @@ add_llvm_library(LLVMTransformUtils ValueMapper.cpp ) +add_llvm_library_dependencies(LLVMTransformUtils + LLVMAnalysis + LLVMCore + LLVMSupport + LLVMTarget + LLVMipa + ) diff --git a/llvm/lib/VMCore/CMakeLists.txt b/llvm/lib/VMCore/CMakeLists.txt index f60dd06c98a64914686522e1cc74e22608e75b3d..2553cc099c5481f4aad671cbe925086d21fb1a6c 100644 --- a/llvm/lib/VMCore/CMakeLists.txt +++ b/llvm/lib/VMCore/CMakeLists.txt @@ -36,3 +36,5 @@ add_llvm_library(LLVMCore ValueTypes.cpp Verifier.cpp ) + +add_llvm_library_dependencies(LLVMCore LLVMSupport) diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt index bc23a64d0efc707413e27b281491f2ce5a3d0e9b..60168623f13b61d3ddce6fb3c1ecfdee860e7067 100644 --- a/llvm/tools/llvm-config/CMakeLists.txt +++ b/llvm/tools/llvm-config/CMakeLists.txt @@ -138,27 +138,3 @@ install(FILES ${LLVM_CONFIG} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION bin) - - -# Regeneration of library dependencies. - -# 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) -set(LLVMLibDeps_TMP ${CMAKE_CURRENT_BINARY_DIR}/LLVMLibDeps.cmake.tmp) - -add_custom_command(OUTPUT ${LLVMLibDeps_TMP} - COMMAND sed -e s'@\\.a@@g' -e s'@\\.so@@g' -e 's@libLLVM@LLVM@g' -e 's@: @ @' -e 's@\\\(.*\\\)@set\(MSVC_LIB_DEPS_\\1\)@' ${FINAL_LIBDEPS} > ${LLVMLibDeps_TMP} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LLVMLibDeps_TMP} ${LLVMLibDeps} - DEPENDS ${FINAL_LIBDEPS} - COMMENT "Updating cmake library dependencies file ${LLVMLibDeps}" - ) - -if( LLVM_TARGETS_TO_BUILD STREQUAL LLVM_ALL_TARGETS ) - add_custom_target(llvmlibdeps.target ALL DEPENDS ${LLVMLibDeps_TMP}) - add_dependencies(llvmlibdeps.target llvm-config.target) - set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} llvmlibdeps.target) -endif() - -set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE)