<div dir="ltr">Crazy idea, what if we have a variable that expands to one of RUNTIME, LIBRARY, or ARCHIVE?</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Apr 16, 2015 at 10:40 AM, Chris Bieneman <span dir="ltr"><<a href="mailto:beanz@apple.com" target="_blank">beanz@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: cbieneman<br>
Date: Thu Apr 16 12:40:51 2015<br>
New Revision: 235123<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=235123&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=235123&view=rev</a><br>
Log:<br>
Fixing windows bots.<br>
<br>
Third time's the try.<br>
<br>
Modified:<br>
llvm/trunk/cmake/modules/AddLLVM.cmake<br>
<br>
Modified: llvm/trunk/cmake/modules/AddLLVM.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=235123&r1=235122&r2=235123&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=235123&r1=235122&r2=235123&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)<br>
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Thu Apr 16 12:40:51 2015<br>
@@ -423,16 +423,18 @@ macro(add_llvm_library name)<br>
set_target_properties( ${name} PROPERTIES EXCLUDE_FROM_ALL ON)<br>
else()<br>
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO")<br>
- if(WIN32 OR CYGWIN)<br>
- install(TARGETS ${name}<br>
- EXPORT LLVMExports<br>
- RUNTIME DESTINATION lib${LLVM_LIBDIR_SUFFIX}<br>
- COMPONENT ${name})<br>
- elseif(ARG_SHARED OR BUILD_SHARED_LIBS)<br>
- install(TARGETS ${name}<br>
- EXPORT LLVMExports<br>
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}<br>
- COMPONENT ${name})<br>
+ if(ARG_SHARED OR BUILD_SHARED_LIBS)<br>
+ if(WIN32 OR CYGWIN)<br>
+ install(TARGETS ${name}<br>
+ EXPORT LLVMExports<br>
+ RUNTIME DESTINATION lib${LLVM_LIBDIR_SUFFIX}<br>
+ COMPONENT ${name})<br>
+ else()<br>
+ install(TARGETS ${name}<br>
+ EXPORT LLVMExports<br>
+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}<br>
+ COMPONENT ${name})<br>
+ endif()<br>
else()<br>
install(TARGETS ${name}<br>
EXPORT LLVMExports<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>