[llvm] r235123 - Fixing windows bots.

[Chris Bieneman]

That’s a really great suggestion. I’ll whip that up. I was a bit panicky this morning when I broke windows :-).

-Chris

> On Apr 16, 2015, at 11:06 AM, Reid Kleckner <rnk at google.com> wrote:
> 
> Crazy idea, what if we have a variable that expands to one of RUNTIME, LIBRARY, or ARCHIVE?
> 
> On Thu, Apr 16, 2015 at 10:40 AM, Chris Bieneman <beanz at apple.com <mailto:beanz at apple.com>> wrote:
> Author: cbieneman
> Date: Thu Apr 16 12:40:51 2015
> New Revision: 235123
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=235123&view=rev <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 <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
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu <mailto:llvm-commits at cs.uiuc.edu>
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits <http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits>
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150416/abe0ec3f/attachment.html>