diff options
| author | Tom Stellard <tstellar@redhat.com> | 2019-07-12 14:40:18 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2019-07-12 14:40:18 +0000 |
| commit | a196469e67ce578df4fc9f348cc5b7221f12b239 (patch) | |
| tree | 2a1856d69c2c0661f8e46d97255b37921b3a8555 /llvm/tools | |
| parent | 90e95bb2891aee3d9ec58a26334a6a71e33cf1f8 (diff) | |
| download | bcm5719-llvm-a196469e67ce578df4fc9f348cc5b7221f12b239.tar.gz bcm5719-llvm-a196469e67ce578df4fc9f348cc5b7221f12b239.zip | |
cmake: Add INSTALL_WITH_TOOLCHAIN option to add_*_library macros
Summary:
This will simplify the macros by allowing us to remove the hard-coded
list of libraries that should be installed when
LLVM_INSTALL_TOOLCHAIN_ONLY is enabled.
Reviewers: beanz, smeenai
Reviewed By: beanz
Subscribers: aheejin, mehdi_amini, mgorny, steven_wu, dexonsmith, cfe-commits, llvm-commits
Tags: #clang, #llvm
Differential Revision: https://reviews.llvm.org/D64580
llvm-svn: 365902
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/llvm-shlib/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | llvm/tools/lto/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llvm/tools/remarks-shlib/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/llvm/tools/llvm-shlib/CMakeLists.txt b/llvm/tools/llvm-shlib/CMakeLists.txt index 5e491ca1f65..4905ed08157 100644 --- a/llvm/tools/llvm-shlib/CMakeLists.txt +++ b/llvm/tools/llvm-shlib/CMakeLists.txt @@ -39,7 +39,10 @@ if(LLVM_BUILD_LLVM_DYLIB) add_custom_target(libLLVMExports DEPENDS ${LLVM_EXPORTED_SYMBOL_FILE}) endif() - add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) + if (LLVM_LINK_LLVM_DYLIB) + set(INSTALL_WITH_TOOLCHAIN INSTALL_WITH_TOOLCHAIN) + endif() + add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) list(REMOVE_DUPLICATES LIB_NAMES) if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) @@ -105,7 +108,7 @@ if(LLVM_BUILD_LLVM_C_DYLIB AND NOT MSVC) add_custom_target(libLLVMCExports DEPENDS ${LLVM_EXPORTED_SYMBOL_FILE}) - add_llvm_library(LLVM-C SHARED ${SOURCES}) + add_llvm_library(LLVM-C SHARED ${SOURCES} INSTALL_WITH_TOOLCHAIN) target_link_libraries(LLVM-C PUBLIC LLVM) add_dependencies(LLVM-C libLLVMCExports) diff --git a/llvm/tools/lto/CMakeLists.txt b/llvm/tools/lto/CMakeLists.txt index 20118e029f8..b86e4abd01a 100644 --- a/llvm/tools/lto/CMakeLists.txt +++ b/llvm/tools/lto/CMakeLists.txt @@ -20,7 +20,7 @@ set(SOURCES set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) -add_llvm_library(LTO SHARED ${SOURCES} DEPENDS intrinsics_gen) +add_llvm_library(LTO SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS intrinsics_gen) install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h DESTINATION include/llvm-c diff --git a/llvm/tools/remarks-shlib/CMakeLists.txt b/llvm/tools/remarks-shlib/CMakeLists.txt index 9408ad70597..e948496c603 100644 --- a/llvm/tools/remarks-shlib/CMakeLists.txt +++ b/llvm/tools/remarks-shlib/CMakeLists.txt @@ -8,7 +8,7 @@ set(SOURCES set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Remarks.exports) -add_llvm_library(Remarks SHARED ${SOURCES}) +add_llvm_library(Remarks SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES}) install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h DESTINATION include/llvm-c |
