From cce559871a4956cab32a6048fa481cb4bd062a5f Mon Sep 17 00:00:00 2001 From: Sumanth Gundapaneni Date: Wed, 16 Dec 2015 17:07:15 +0000 Subject: [PATCH] Install runtime dlls in the INSTALL_DIR/bin directory. NFC 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 Differential Revision: http://reviews.llvm.org/D15505 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@255781 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/modules/AddLLVM.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 23559d604bc..bed81b28426 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -541,9 +541,11 @@ macro(add_llvm_library name) 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) + if(WIN32 OR CYGWIN OR MINGW) set(install_type RUNTIME) + set(install_dir bin) else() set(install_type LIBRARY) endif() @@ -553,7 +555,7 @@ macro(add_llvm_library name) install(TARGETS ${name} EXPORT LLVMExports - ${install_type} DESTINATION lib${LLVM_LIBDIR_SUFFIX} + ${install_type} DESTINATION ${install_dir} COMPONENT ${name}) if (NOT CMAKE_CONFIGURATION_TYPES) -- 2.34.1