[llvm] 733f7b5 - Revert "[build] normalize components dependencies"

[via llvm-commits]

Author: serge-sans-paille
Date: 2020-11-18T19:23:11+01:00
New Revision: 733f7b50840a202a7ca950db03a2e7d09a147453

URL: https://github.com/llvm/llvm-project/commit/733f7b50840a202a7ca950db03a2e7d09a147453
DIFF: https://github.com/llvm/llvm-project/commit/733f7b50840a202a7ca950db03a2e7d09a147453.diff

LOG: Revert "[build] normalize components dependencies"

This reverts commit c6ef6e1690d517b3401ea06b1fe46871eb67434d.

Basically, publicly linked libraries have a different semantic than components,
which link libraries privately.

Differential Revision: https://reviews.llvm.org/D91461

Added: 
    

Modified: 
    llvm/lib/ExecutionEngine/CMakeLists.txt
    llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
    llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
    llvm/lib/FileCheck/CMakeLists.txt
    llvm/lib/Frontend/OpenACC/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/lib/ExecutionEngine/CMakeLists.txt b/llvm/lib/ExecutionEngine/CMakeLists.txt
index 49a597acb37b..22203da90f7a 100644
--- a/llvm/lib/ExecutionEngine/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/CMakeLists.txt
@@ -22,6 +22,10 @@ add_llvm_component_library(LLVMExecutionEngine
   Target
   )
 
+if(BUILD_SHARED_LIBS)
+  target_link_libraries(LLVMExecutionEngine PUBLIC LLVMRuntimeDyld)
+endif()
+
 add_subdirectory(Interpreter)
 add_subdirectory(JITLink)
 add_subdirectory(MCJIT)

diff  --git a/llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt b/llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
index d8088b4fe5a2..512e3523a1ea 100644
--- a/llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
@@ -24,3 +24,10 @@ add_llvm_component_library(LLVMJITLink
   OrcTargetProcess
   Support
   )
+ 
+target_link_libraries(LLVMJITLink
+  PRIVATE
+  LLVMObject
+  LLVMOrcTargetProcess
+  LLVMSupport
+)

diff  --git a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
index cba92a24ebcb..791b037323f2 100644
--- a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
@@ -32,9 +32,6 @@ add_llvm_component_library(LLVMOrcJIT
   intrinsics_gen
 
   LINK_COMPONENTS
-  Analysis
-  BitReader
-  BitWriter
   Core
   ExecutionEngine
   JITLink
@@ -51,3 +48,11 @@ add_llvm_component_library(LLVMOrcJIT
 
 add_subdirectory(Shared)
 add_subdirectory(TargetProcess)
+
+target_link_libraries(LLVMOrcJIT
+  PRIVATE
+  LLVMAnalysis
+  LLVMBitReader
+  LLVMBitWriter
+  LLVMPasses
+  )

diff  --git a/llvm/lib/FileCheck/CMakeLists.txt b/llvm/lib/FileCheck/CMakeLists.txt
index 1e3456279ea0..91c80e1482f1 100644
--- a/llvm/lib/FileCheck/CMakeLists.txt
+++ b/llvm/lib/FileCheck/CMakeLists.txt
@@ -3,7 +3,6 @@ add_llvm_component_library(LLVMFileCheck
 
   ADDITIONAL_HEADER_DIRS
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/FileCheck"
-
-  LINK_COMPONENTS
-  Support
 )
+
+target_link_libraries(LLVMFileCheck LLVMSupport)

diff  --git a/llvm/lib/Frontend/OpenACC/CMakeLists.txt b/llvm/lib/Frontend/OpenACC/CMakeLists.txt
index 3667f46e8e31..ba340ab9c561 100644
--- a/llvm/lib/Frontend/OpenACC/CMakeLists.txt
+++ b/llvm/lib/Frontend/OpenACC/CMakeLists.txt
@@ -12,7 +12,7 @@ add_llvm_component_library(LLVMFrontendOpenACC
   DEPENDS
   acc_gen
   acc_cpp
-
-  LINK_COMPONENTS
-  Support
 )
+
+target_link_libraries(LLVMFrontendOpenACC LLVMSupport)
+