2020-07-25 06:47:38 +08:00
|
|
|
include(GetLibraryName)
|
|
|
|
|
|
|
|
|
|
if(LLVM_ENABLE_LIBXML2)
|
|
|
|
|
set(imported_libs LibXml2::LibXml2)
|
|
|
|
|
endif()
|
|
|
|
|
|
[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
2019-11-14 13:39:58 +08:00
|
|
|
add_llvm_component_library(LLVMWindowsManifest
|
2018-04-07 12:28:08 +08:00
|
|
|
WindowsManifestMerger.cpp
|
|
|
|
|
|
|
|
|
|
ADDITIONAL_HEADER_DIRS
|
|
|
|
|
${LLVM_MAIN_INCLUDE_DIR}/llvm/WindowsManifest
|
2020-07-25 06:47:38 +08:00
|
|
|
${Backtrace_INCLUDE_DIRS}
|
2020-10-10 00:41:21 +08:00
|
|
|
|
|
|
|
|
LINK_LIBS
|
|
|
|
|
${imported_libs}
|
|
|
|
|
|
|
|
|
|
LINK_COMPONENTS
|
|
|
|
|
Support
|
|
|
|
|
)
|
2018-04-07 12:28:08 +08:00
|
|
|
|
2020-07-25 06:47:38 +08:00
|
|
|
# This block is only needed for llvm-config. When we deprecate llvm-config and
|
|
|
|
|
# move to using CMake export, this block can be removed.
|
|
|
|
|
if(LLVM_ENABLE_LIBXML2)
|
|
|
|
|
# CMAKE_BUILD_TYPE is only meaningful to single-configuration generators.
|
|
|
|
|
if(CMAKE_BUILD_TYPE)
|
|
|
|
|
string(TOUPPER ${CMAKE_BUILD_TYPE} build_type)
|
|
|
|
|
get_property(libxml2_library TARGET LibXml2::LibXml2 PROPERTY LOCATION_${build_type})
|
|
|
|
|
endif()
|
|
|
|
|
if(NOT zlib_library)
|
|
|
|
|
get_property(libxml2_library TARGET LibXml2::LibXml2 PROPERTY LOCATION)
|
2020-02-28 11:23:57 +08:00
|
|
|
endif()
|
2020-07-25 06:47:38 +08:00
|
|
|
get_library_name(${libxml2_library} libxml2_library)
|
|
|
|
|
set_property(TARGET LLVMWindowsManifest PROPERTY LLVM_SYSTEM_LIBS ${libxml2_library})
|
2019-12-04 01:27:14 +08:00
|
|
|
endif()
|