[llvm] r319840 - [CMake] Use PRIVATE in target_link_libraries for executables
Shoaib Meenai via llvm-commits
llvm-commits at lists.llvm.org
Tue Dec 5 13:49:56 PST 2017
Author: smeenai
Date: Tue Dec 5 13:49:56 2017
New Revision: 319840
URL: http://llvm.org/viewvc/llvm-project?rev=319840&view=rev
Log:
[CMake] Use PRIVATE in target_link_libraries for executables
We currently use target_link_libraries without an explicit scope
specifier (INTERFACE, PRIVATE or PUBLIC) when linking executables.
Dependencies added in this way apply to both the target and its
dependencies, i.e. they become part of the executable's link interface
and are transitive.
Transitive dependencies generally don't make sense for executables,
since you wouldn't normally be linking against an executable. This also
causes issues for generating install export files when using
LLVM_DISTRIBUTION_COMPONENTS. For example, clang has a lot of LLVM
library dependencies, which are currently added as interface
dependencies. If clang is in the distribution components but the LLVM
libraries it depends on aren't (which is a perfectly legitimate use case
if the LLVM libraries are being built static and there are therefore no
run-time dependencies on them), CMake will complain about the LLVM
libraries not being in export set when attempting to generate the
install export file for clang. This is reasonable behavior on CMake's
part, and the right thing is for LLVM's build system to explicitly use
PRIVATE dependencies for executables.
Unfortunately, CMake doesn't allow you to mix and match the keyword and
non-keyword target_link_libraries signatures for a single target; i.e.,
if a single call to target_link_libraries for a particular target uses
one of the INTERFACE, PRIVATE, or PUBLIC keywords, all other calls must
also be updated to use those keywords. This means we must do this change
in a single shot. I also fully expect to have missed some instances; I
tested by enabling all the projects in the monorepo (except dragonegg),
and configuring both with and without shared libraries, on both Darwin
and Linux, but I'm planning to rely on the buildbots for other
configurations (since it should be pretty easy to fix those).
Even after this change, we still have a lot of target_link_libraries
calls that don't specify a scope keyword, mostly for shared libraries.
I'm thinking about addressing those in a follow-up, but that's a
separate change IMO.
Differential Revision: https://reviews.llvm.org/D40823
Modified:
llvm/trunk/cmake/modules/AddLLVM.cmake
llvm/trunk/cmake/modules/LLVM-Config.cmake
llvm/trunk/examples/ParallelJIT/CMakeLists.txt
llvm/trunk/tools/bugpoint/CMakeLists.txt
llvm/trunk/tools/dsymutil/CMakeLists.txt
llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt
llvm/trunk/tools/llvm-objdump/CMakeLists.txt
llvm/trunk/tools/opt/CMakeLists.txt
llvm/trunk/unittests/DebugInfo/CodeView/CMakeLists.txt
llvm/trunk/unittests/DebugInfo/DWARF/CMakeLists.txt
llvm/trunk/unittests/DebugInfo/MSF/CMakeLists.txt
llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt
llvm/trunk/unittests/ExecutionEngine/Orc/CMakeLists.txt
llvm/trunk/unittests/ProfileData/CMakeLists.txt
llvm/trunk/unittests/Support/CMakeLists.txt
llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt
llvm/trunk/unittests/tools/llvm-cfi-verify/CMakeLists.txt
llvm/trunk/utils/FileCheck/CMakeLists.txt
llvm/trunk/utils/not/CMakeLists.txt
llvm/trunk/utils/yaml-bench/CMakeLists.txt
Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Tue Dec 5 13:49:56 2017
@@ -768,7 +768,7 @@ macro(add_llvm_executable name)
# libpthreads overrides some standard library symbols, so main
# executable must be linked with it in order to provide consistent
# API for all shared libaries loaded by this executable.
- target_link_libraries(${name} ${LLVM_PTHREAD_LIB})
+ target_link_libraries(${name} PRIVATE ${LLVM_PTHREAD_LIB})
endif()
endmacro(add_llvm_executable name)
@@ -1093,7 +1093,7 @@ function(add_unittest test_suite test_na
# libpthreads overrides some standard library symbols, so main
# executable must be linked with it in order to provide consistent
# API for all shared libaries loaded by this executable.
- target_link_libraries(${test_name} gtest_main gtest ${LLVM_PTHREAD_LIB})
+ target_link_libraries(${test_name} PRIVATE gtest_main gtest ${LLVM_PTHREAD_LIB})
add_dependencies(${test_suite} ${test_name})
get_target_property(test_suite_folder ${test_suite} FOLDER)
Modified: llvm/trunk/cmake/modules/LLVM-Config.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVM-Config.cmake?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/LLVM-Config.cmake (original)
+++ llvm/trunk/cmake/modules/LLVM-Config.cmake Tue Dec 5 13:49:56 2017
@@ -87,7 +87,7 @@ macro(llvm_config executable)
endif()
endif()
- target_link_libraries(${executable} LLVM)
+ target_link_libraries(${executable} PRIVATE LLVM)
endif()
explicit_llvm_config(${executable} ${link_components})
@@ -101,7 +101,7 @@ function(explicit_llvm_config executable
get_target_property(t ${executable} TYPE)
if(t STREQUAL "STATIC_LIBRARY")
target_link_libraries(${executable} INTERFACE ${LIBRARIES})
- elseif(t STREQUAL "SHARED_LIBRARY" OR t STREQUAL "MODULE_LIBRARY")
+ elseif(t STREQUAL "EXECUTABLE" OR t STREQUAL "SHARED_LIBRARY" OR t STREQUAL "MODULE_LIBRARY")
target_link_libraries(${executable} PRIVATE ${LIBRARIES})
else()
# Use plain form for legacy user.
Modified: llvm/trunk/examples/ParallelJIT/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/ParallelJIT/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/examples/ParallelJIT/CMakeLists.txt (original)
+++ llvm/trunk/examples/ParallelJIT/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -11,4 +11,4 @@ add_llvm_example(ParallelJIT
ParallelJIT.cpp
)
-target_link_libraries(ParallelJIT ${LLVM_PTHREAD_LIB})
+target_link_libraries(ParallelJIT PRIVATE ${LLVM_PTHREAD_LIB})
Modified: llvm/trunk/tools/bugpoint/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/tools/bugpoint/CMakeLists.txt (original)
+++ llvm/trunk/tools/bugpoint/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -37,7 +37,7 @@ add_llvm_tool(bugpoint
export_executable_symbols(bugpoint)
if(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)
- target_link_libraries(bugpoint Polly)
+ target_link_libraries(bugpoint PRIVATE Polly)
# Ensure LLVMTarget can resolve dependences in Polly.
- target_link_libraries(bugpoint LLVMTarget)
+ target_link_libraries(bugpoint PRIVATE LLVMTarget)
endif(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)
Modified: llvm/trunk/tools/dsymutil/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/CMakeLists.txt (original)
+++ llvm/trunk/tools/dsymutil/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -22,5 +22,5 @@ add_llvm_tool(llvm-dsymutil
)
IF(APPLE)
- target_link_libraries(llvm-dsymutil "-framework CoreFoundation")
+ target_link_libraries(llvm-dsymutil PRIVATE "-framework CoreFoundation")
ENDIF(APPLE)
Modified: llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-cfi-verify/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -15,4 +15,4 @@ add_llvm_tool(llvm-cfi-verify
llvm-cfi-verify.cpp)
add_subdirectory(lib)
-target_link_libraries(llvm-cfi-verify LLVMCFIVerify)
+target_link_libraries(llvm-cfi-verify PRIVATE LLVMCFIVerify)
Modified: llvm/trunk/tools/llvm-objdump/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-objdump/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -23,7 +23,7 @@ add_llvm_tool(llvm-objdump
)
if(HAVE_LIBXAR)
- target_link_libraries(llvm-objdump ${XAR_LIB})
+ target_link_libraries(llvm-objdump PRIVATE ${XAR_LIB})
endif()
if(LLVM_INSTALL_BINUTILS_SYMLINKS)
Modified: llvm/trunk/tools/opt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/tools/opt/CMakeLists.txt (original)
+++ llvm/trunk/tools/opt/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -37,5 +37,5 @@ add_llvm_tool(opt
export_executable_symbols(opt)
if(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)
- target_link_libraries(opt Polly)
+ target_link_libraries(opt PRIVATE Polly)
endif(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)
Modified: llvm/trunk/unittests/DebugInfo/CodeView/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/CodeView/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/unittests/DebugInfo/CodeView/CMakeLists.txt (original)
+++ llvm/trunk/unittests/DebugInfo/CodeView/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -11,4 +11,4 @@ add_llvm_unittest(DebugInfoCodeViewTests
${DebugInfoCodeViewSources}
)
-target_link_libraries(DebugInfoCodeViewTests LLVMTestingSupport)
\ No newline at end of file
+target_link_libraries(DebugInfoCodeViewTests PRIVATE LLVMTestingSupport)
Modified: llvm/trunk/unittests/DebugInfo/DWARF/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/DWARF/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/unittests/DebugInfo/DWARF/CMakeLists.txt (original)
+++ llvm/trunk/unittests/DebugInfo/DWARF/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -18,4 +18,4 @@ add_llvm_unittest(DebugInfoDWARFTests
${DebugInfoSources}
)
-target_link_libraries(DebugInfoDWARFTests LLVMTestingSupport)
+target_link_libraries(DebugInfoDWARFTests PRIVATE LLVMTestingSupport)
Modified: llvm/trunk/unittests/DebugInfo/MSF/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/MSF/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/unittests/DebugInfo/MSF/CMakeLists.txt (original)
+++ llvm/trunk/unittests/DebugInfo/MSF/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -12,4 +12,4 @@ add_llvm_unittest(DebugInfoMSFTests
${DebugInfoMSFSources}
)
-target_link_libraries(DebugInfoMSFTests LLVMTestingSupport)
+target_link_libraries(DebugInfoMSFTests PRIVATE LLVMTestingSupport)
Modified: llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt (original)
+++ llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -14,4 +14,4 @@ add_llvm_unittest(DebugInfoPDBTests
${DebugInfoPDBSources}
)
-target_link_libraries(DebugInfoPDBTests LLVMTestingSupport)
+target_link_libraries(DebugInfoPDBTests PRIVATE LLVMTestingSupport)
Modified: llvm/trunk/unittests/ExecutionEngine/Orc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ExecutionEngine/Orc/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/unittests/ExecutionEngine/Orc/CMakeLists.txt (original)
+++ llvm/trunk/unittests/ExecutionEngine/Orc/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -24,4 +24,4 @@ add_llvm_unittest(OrcJITTests
SymbolStringPoolTest.cpp
)
-target_link_libraries(OrcJITTests ${LLVM_PTHREAD_LIB})
+target_link_libraries(OrcJITTests PRIVATE ${LLVM_PTHREAD_LIB})
Modified: llvm/trunk/unittests/ProfileData/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ProfileData/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/unittests/ProfileData/CMakeLists.txt (original)
+++ llvm/trunk/unittests/ProfileData/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -11,4 +11,4 @@ add_llvm_unittest(ProfileDataTests
SampleProfTest.cpp
)
-target_link_libraries(ProfileDataTests LLVMTestingSupport)
+target_link_libraries(ProfileDataTests PRIVATE LLVMTestingSupport)
Modified: llvm/trunk/unittests/Support/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/CMakeLists.txt (original)
+++ llvm/trunk/unittests/Support/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -74,6 +74,6 @@ add_llvm_unittest(SupportTests
set_source_files_properties(AlignOfTest.cpp PROPERTIES COMPILE_FLAGS -w)
# ManagedStatic.cpp uses <pthread>.
-target_link_libraries(SupportTests LLVMTestingSupport ${LLVM_PTHREAD_LIB})
+target_link_libraries(SupportTests PRIVATE LLVMTestingSupport ${LLVM_PTHREAD_LIB})
add_subdirectory(DynamicLibrary)
Modified: llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt (original)
+++ llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -4,7 +4,7 @@ add_library(DynamicLibraryLib STATIC Exp
set_target_properties(DynamicLibraryLib PROPERTIES FOLDER "Tests")
add_llvm_unittest(DynamicLibraryTests DynamicLibraryTest.cpp)
-target_link_libraries(DynamicLibraryTests DynamicLibraryLib)
+target_link_libraries(DynamicLibraryTests PRIVATE DynamicLibraryLib)
export_executable_symbols(DynamicLibraryTests)
function(dynlib_add_module NAME)
Modified: llvm/trunk/unittests/tools/llvm-cfi-verify/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/tools/llvm-cfi-verify/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/unittests/tools/llvm-cfi-verify/CMakeLists.txt (original)
+++ llvm/trunk/unittests/tools/llvm-cfi-verify/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -14,4 +14,4 @@ set(LLVM_LINK_COMPONENTS
add_llvm_unittest(CFIVerifyTests
FileAnalysis.cpp
GraphBuilder.cpp)
-target_link_libraries(CFIVerifyTests LLVMCFIVerify)
+target_link_libraries(CFIVerifyTests PRIVATE LLVMCFIVerify)
Modified: llvm/trunk/utils/FileCheck/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/FileCheck/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/utils/FileCheck/CMakeLists.txt (original)
+++ llvm/trunk/utils/FileCheck/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -2,4 +2,4 @@ add_llvm_utility(FileCheck
FileCheck.cpp
)
-target_link_libraries(FileCheck LLVMSupport)
+target_link_libraries(FileCheck PRIVATE LLVMSupport)
Modified: llvm/trunk/utils/not/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/not/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/utils/not/CMakeLists.txt (original)
+++ llvm/trunk/utils/not/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -2,4 +2,4 @@ add_llvm_utility(not
not.cpp
)
-target_link_libraries(not LLVMSupport)
+target_link_libraries(not PRIVATE LLVMSupport)
Modified: llvm/trunk/utils/yaml-bench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/yaml-bench/CMakeLists.txt?rev=319840&r1=319839&r2=319840&view=diff
==============================================================================
--- llvm/trunk/utils/yaml-bench/CMakeLists.txt (original)
+++ llvm/trunk/utils/yaml-bench/CMakeLists.txt Tue Dec 5 13:49:56 2017
@@ -2,4 +2,4 @@ add_llvm_utility(yaml-bench
YAMLBench.cpp
)
-target_link_libraries(yaml-bench LLVMSupport)
+target_link_libraries(yaml-bench PRIVATE LLVMSupport)
More information about the llvm-commits
mailing list