From ab411801b82783eb7f652701ccfce81b16cf1811 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 14 Nov 2019 05:39:58 +0000 Subject: [cmake] Explicitly mark libraries defined in lib/ as "Component Libraries" Summary: Most libraries are defined in the lib/ directory but there are also a few libraries defined in tools/ e.g. libLLVM, libLTO. I'm defining "Component Libraries" as libraries defined in lib/ that may be included in libLLVM.so. Explicitly marking the libraries in lib/ as component libraries allows us to remove some fragile checks that attempt to differentiate between lib/ libraries and tools/ libraires: 1. In tools/llvm-shlib, because llvm_map_components_to_libnames(LIB_NAMES "all") returned a list of all libraries defined in the whole project, there was custom code needed to filter out libraries defined in tools/, none of which should be included in libLLVM.so. This code assumed that any library defined as static was from lib/ and everything else should be excluded. With this change, llvm_map_components_to_libnames(LIB_NAMES, "all") only returns libraries that have been added to the LLVM_COMPONENT_LIBS global cmake property, so this custom filtering logic can be removed. Doing this also fixes the build with BUILD_SHARED_LIBS=ON and LLVM_BUILD_LLVM_DYLIB=ON. 2. There was some code in llvm_add_library that assumed that libraries defined in lib/ would not have LLVM_LINK_COMPONENTS or ARG_LINK_COMPONENTS set. This is only true because libraries defined lib lib/ use LLVMBuild.txt and don't set these values. This code has been fixed now to check if the library has been explicitly marked as a component library, which should now make it easier to remove LLVMBuild at some point in the future. I have tested this patch on Windows, MacOS and Linux with release builds and the following combinations of CMake options: - "" (No options) - -DLLVM_BUILD_LLVM_DYLIB=ON - -DLLVM_LINK_LLVM_DYLIB=ON - -DBUILD_SHARED_LIBS=ON - -DBUILD_SHARED_LIBS=ON -DLLVM_BUILD_LLVM_DYLIB=ON - -DBUILD_SHARED_LIBS=ON -DLLVM_LINK_LLVM_DYLIB=ON Reviewers: beanz, smeenai, compnerd, phosek Reviewed By: beanz Subscribers: wuzish, jholewinski, arsenm, dschuff, jyknight, dylanmckay, sdardis, nemanjai, jvesely, nhaehnle, mgorny, mehdi_amini, sbc100, jgravelle-google, hiraditya, aheejin, fedor.sergeev, asb, rbar, johnrusso, simoncook, apazos, sabuasal, niosHD, jrtc27, MaskRay, zzheng, edward-jones, atanasyan, steven_wu, rogfer01, MartinMosbeck, brucehoult, the_o, dexonsmith, PkmX, jocewei, jsji, dang, Jim, lenary, s.egerton, pzheng, sameer.abuasal, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D70179 --- llvm/lib/DebugInfo/CodeView/CMakeLists.txt | 2 +- llvm/lib/DebugInfo/DWARF/CMakeLists.txt | 2 +- llvm/lib/DebugInfo/GSYM/CMakeLists.txt | 2 +- llvm/lib/DebugInfo/MSF/CMakeLists.txt | 2 +- llvm/lib/DebugInfo/PDB/CMakeLists.txt | 2 +- llvm/lib/DebugInfo/Symbolize/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'llvm/lib/DebugInfo') diff --git a/llvm/lib/DebugInfo/CodeView/CMakeLists.txt b/llvm/lib/DebugInfo/CodeView/CMakeLists.txt index 1610ca46957..84d1cf94e75 100644 --- a/llvm/lib/DebugInfo/CodeView/CMakeLists.txt +++ b/llvm/lib/DebugInfo/CodeView/CMakeLists.txt @@ -1,4 +1,4 @@ -add_llvm_library(LLVMDebugInfoCodeView +add_llvm_component_library(LLVMDebugInfoCodeView AppendingTypeTableBuilder.cpp CodeViewError.cpp CodeViewRecordIO.cpp diff --git a/llvm/lib/DebugInfo/DWARF/CMakeLists.txt b/llvm/lib/DebugInfo/DWARF/CMakeLists.txt index fcfb00e8e5f..3fe9904f221 100644 --- a/llvm/lib/DebugInfo/DWARF/CMakeLists.txt +++ b/llvm/lib/DebugInfo/DWARF/CMakeLists.txt @@ -1,4 +1,4 @@ -add_llvm_library(LLVMDebugInfoDWARF +add_llvm_component_library(LLVMDebugInfoDWARF DWARFAbbreviationDeclaration.cpp DWARFAddressRange.cpp DWARFAcceleratorTable.cpp diff --git a/llvm/lib/DebugInfo/GSYM/CMakeLists.txt b/llvm/lib/DebugInfo/GSYM/CMakeLists.txt index 2369f05197a..632ccff5d79 100644 --- a/llvm/lib/DebugInfo/GSYM/CMakeLists.txt +++ b/llvm/lib/DebugInfo/GSYM/CMakeLists.txt @@ -1,4 +1,4 @@ -add_llvm_library(LLVMDebugInfoGSYM +add_llvm_component_library(LLVMDebugInfoGSYM Header.cpp FileWriter.cpp FunctionInfo.cpp diff --git a/llvm/lib/DebugInfo/MSF/CMakeLists.txt b/llvm/lib/DebugInfo/MSF/CMakeLists.txt index 6f38de336ee..828e2617f65 100644 --- a/llvm/lib/DebugInfo/MSF/CMakeLists.txt +++ b/llvm/lib/DebugInfo/MSF/CMakeLists.txt @@ -1,4 +1,4 @@ -add_llvm_library(LLVMDebugInfoMSF +add_llvm_component_library(LLVMDebugInfoMSF MappedBlockStream.cpp MSFBuilder.cpp MSFCommon.cpp diff --git a/llvm/lib/DebugInfo/PDB/CMakeLists.txt b/llvm/lib/DebugInfo/PDB/CMakeLists.txt index 0e842af9f18..320ca78b525 100644 --- a/llvm/lib/DebugInfo/PDB/CMakeLists.txt +++ b/llvm/lib/DebugInfo/PDB/CMakeLists.txt @@ -84,7 +84,7 @@ add_pdb_impl_folder(Native list(APPEND LIBPDB_ADDITIONAL_HEADER_DIRS "${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/PDB/Native") list(APPEND LIBPDB_ADDITIONAL_HEADER_DIRS "${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/PDB") -add_llvm_library(LLVMDebugInfoPDB +add_llvm_component_library(LLVMDebugInfoPDB GenericError.cpp IPDBSourceFile.cpp PDB.cpp diff --git a/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt b/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt index fe5c4bfc432..79fbb14ed74 100644 --- a/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt +++ b/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt @@ -1,4 +1,4 @@ -add_llvm_library(LLVMSymbolize +add_llvm_component_library(LLVMSymbolize DIPrinter.cpp SymbolizableObjectFile.cpp Symbolize.cpp -- cgit v1.2.3