From c6ef6e1690d517b3401ea06b1fe46871eb67434d Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Fri, 13 Nov 2020 22:45:55 +0100 Subject: [PATCH] [build] normalize components dependencies Use LINK_COMPONENTS instead of explicit target_link_libraries for components. This avoids redundancy and potential inconsistencies. Differential Revision: https://reviews.llvm.org/D91461 --- llvm/lib/ExecutionEngine/CMakeLists.txt | 4 ---- llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt | 7 ------- llvm/lib/ExecutionEngine/Orc/CMakeLists.txt | 11 +++-------- llvm/lib/FileCheck/CMakeLists.txt | 5 +++-- llvm/lib/Frontend/OpenACC/CMakeLists.txt | 6 +++--- 5 files changed, 9 insertions(+), 24 deletions(-) diff --git a/llvm/lib/ExecutionEngine/CMakeLists.txt b/llvm/lib/ExecutionEngine/CMakeLists.txt index 22203da..49a597a 100644 --- a/llvm/lib/ExecutionEngine/CMakeLists.txt +++ b/llvm/lib/ExecutionEngine/CMakeLists.txt @@ -22,10 +22,6 @@ 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 512e352..d8088b4 100644 --- a/llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt +++ b/llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt @@ -24,10 +24,3 @@ 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 791b0373..cba92a2 100644 --- a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt +++ b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt @@ -32,6 +32,9 @@ add_llvm_component_library(LLVMOrcJIT intrinsics_gen LINK_COMPONENTS + Analysis + BitReader + BitWriter Core ExecutionEngine JITLink @@ -48,11 +51,3 @@ 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 91c80e1..1e34562 100644 --- a/llvm/lib/FileCheck/CMakeLists.txt +++ b/llvm/lib/FileCheck/CMakeLists.txt @@ -3,6 +3,7 @@ add_llvm_component_library(LLVMFileCheck ADDITIONAL_HEADER_DIRS "${LLVM_MAIN_INCLUDE_DIR}/llvm/FileCheck" -) -target_link_libraries(LLVMFileCheck LLVMSupport) + LINK_COMPONENTS + Support +) diff --git a/llvm/lib/Frontend/OpenACC/CMakeLists.txt b/llvm/lib/Frontend/OpenACC/CMakeLists.txt index ba340ab..3667f46 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 -) - -target_link_libraries(LLVMFrontendOpenACC LLVMSupport) + LINK_COMPONENTS + Support +) -- 2.7.4