[PATCH] D49843: [CMake] Followup for r337366: Only export LLVM_LINK_LLVM_DYLIB it it's set to ON
Phabricator via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Jul 27 04:00:15 PDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rL338119: [CMake] Followup for r337366: Only export LLVM_LINK_LLVM_DYLIB if it's set to ON (authored by pfaffe, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D49843?vs=157455&id=157663#toc
Repository:
rL LLVM
https://reviews.llvm.org/D49843
Files:
llvm/trunk/cmake/modules/CMakeLists.txt
llvm/trunk/cmake/modules/LLVMConfig.cmake.in
Index: llvm/trunk/cmake/modules/LLVMConfig.cmake.in
===================================================================
--- llvm/trunk/cmake/modules/LLVMConfig.cmake.in
+++ llvm/trunk/cmake/modules/LLVMConfig.cmake.in
@@ -13,7 +13,7 @@
set(LLVM_AVAILABLE_LIBS @LLVM_AVAILABLE_LIBS@)
-set(LLVM_LINK_LLVM_DYLIB @LLVM_LINK_LLVM_DYLIB@)
+ at LLVM_CONFIG_LINK_LLVM_DYLIB@
set(LLVM_DYLIB_COMPONENTS @LLVM_DYLIB_COMPONENTS@)
Index: llvm/trunk/cmake/modules/CMakeLists.txt
===================================================================
--- llvm/trunk/cmake/modules/CMakeLists.txt
+++ llvm/trunk/cmake/modules/CMakeLists.txt
@@ -47,6 +47,12 @@
set(LLVM_CONFIG_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
set(LLVM_CONFIG_BINARY_DIR "${LLVM_BINARY_DIR}")
set(LLVM_CONFIG_TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}")
+
+if (LLVM_LINK_LLVM_DYLIB)
+ set(LLVM_CONFIG_LINK_LLVM_DYLIB
+ "set(LLVM_LINK_LLVM_DYLIB ${LLVM_LINK_LLVM_DYLIB})")
+endif()
+
# We need to use the full path to the LLVM Exports file to make sure we get the
# one from the build tree. This is due to our cmake files being split between
# this source dir and the binary dir in the build tree configuration and the
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D49843.157663.patch
Type: text/x-patch
Size: 1190 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180727/0cc58825/attachment.bin>
More information about the llvm-commits
mailing list