[llvm] r235123 - Fixing windows bots.

Chris Bieneman beanz at apple.com
Thu Apr 16 10:40:51 PDT 2015


Author: cbieneman
Date: Thu Apr 16 12:40:51 2015
New Revision: 235123

URL: http://llvm.org/viewvc/llvm-project?rev=235123&view=rev
Log:
Fixing windows bots.

Third time's the try.

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=235123&r1=235122&r2=235123&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Thu Apr 16 12:40:51 2015
@@ -423,16 +423,18 @@ macro(add_llvm_library name)
     set_target_properties( ${name} PROPERTIES EXCLUDE_FROM_ALL ON)
   else()
     if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO")
-      if(WIN32 OR CYGWIN)
-        install(TARGETS ${name}
-          EXPORT LLVMExports
-          RUNTIME DESTINATION lib${LLVM_LIBDIR_SUFFIX}
-          COMPONENT ${name})
-      elseif(ARG_SHARED OR BUILD_SHARED_LIBS)
-        install(TARGETS ${name}
-          EXPORT LLVMExports
-          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
-          COMPONENT ${name})
+      if(ARG_SHARED OR BUILD_SHARED_LIBS)
+        if(WIN32 OR CYGWIN)
+          install(TARGETS ${name}
+            EXPORT LLVMExports
+            RUNTIME DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+            COMPONENT ${name})
+        else()
+          install(TARGETS ${name}
+            EXPORT LLVMExports
+            LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+            COMPONENT ${name})
+        endif()
       else()
         install(TARGETS ${name}
           EXPORT LLVMExports





More information about the llvm-commits mailing list