[PATCH] D15505: Install runtime dlls in the INSTALL_DIR/bin directory. NFC
Sumanth Gundapaneni via llvm-commits
llvm-commits at lists.llvm.org
Mon Dec 14 12:31:13 PST 2015
sgundapa created this revision.
sgundapa added reviewers: beanz, chapuni, thakis.
sgundapa added a subscriber: llvm-commits.
One of the earlier patches updated the cmake rule to install the
runtime dlls in INSTALL_DIR/lib which is not correct. This patch
updates the rule to install CMake's RUNTIME in bin directory
http://reviews.llvm.org/D15505
Files:
cmake/modules/AddLLVM.cmake
Index: cmake/modules/AddLLVM.cmake
===================================================================
--- cmake/modules/AddLLVM.cmake
+++ cmake/modules/AddLLVM.cmake
@@ -541,9 +541,11 @@
set_target_properties( ${name} PROPERTIES EXCLUDE_FROM_ALL ON)
elseif(NOT _is_gtest)
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO")
+ set(install_dir lib${LLVM_LIBDIR_SUFFIX})
if(ARG_SHARED OR BUILD_SHARED_LIBS)
if(WIN32 OR CYGWIN)
set(install_type RUNTIME)
+ set(install_dir bin)
else()
set(install_type LIBRARY)
endif()
@@ -553,7 +555,7 @@
install(TARGETS ${name}
EXPORT LLVMExports
- ${install_type} DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+ ${install_type} DESTINATION ${install_dir}
COMPONENT ${name})
if (NOT CMAKE_CONFIGURATION_TYPES)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D15505.42753.patch
Type: text/x-patch
Size: 892 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151214/4fd2f92e/attachment.bin>
More information about the llvm-commits
mailing list