[PATCH] Select correct clang++ output directory when building with cmake as sub directory on Windows

[Neil Henning]

Hey all,

I realize with the 3.4 release these kind of patches can easily become 
overlooked - but could someone please either pull the patch in for us, 
or clarify where we could have made a mistake?

We followed the advice for the previous patches we have submitted and 
assigned it to the owner in CODE_OWNERS.TXT (which just so happened to 
be Chandler!), perhaps there is someone else we could bring into the 
review process?

Cheers,
-Neil.

On 06/01/2014 12:57, Kenneth Benzie wrote:
> Hi chandlerc,
>
> When a root CMakeLists adds llvm as a sub directory on windows the post build step which copies clang++.exe fails due clang.exe not being found.
>
> This is due to the CMAKE_BINARY_DIR variable pointing to the wrong directory, using LLVM_BINARY_DIR instead fixes this issue.
>
> http://llvm-reviews.chandlerc.com/D2515
>
> Files:
>    CMakeLists.txt
>
> Index: CMakeLists.txt
> ===================================================================
> --- CMakeLists.txt
> +++ CMakeLists.txt
> @@ -174,8 +174,8 @@
>   set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
>   set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
>   
> -set(CLANG_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
> -set(CLANG_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib)
> +set(CLANG_RUNTIME_OUTPUT_INTDIR ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
> +set(CLANG_LIBRARY_OUTPUT_INTDIR ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib)
>   
>   if( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE )
>     message(FATAL_ERROR "In-source builds are not allowed. CMake would overwrite "
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits



---
This email is free from viruses and malware because avast! Antivirus protection is active.
http://www.avast.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140113/4c6fd73b/attachment.html>