Commit: 285577a378ee0043fbd9049263d3b81813849c0d
Author: Ray Molenkamp
Date:   Fri Mar 8 06:59:54 2019 -0700
Branches: blender2.7
https://developer.blender.org/rB285577a378ee0043fbd9049263d3b81813849c0d

build_environment/Windows: Copy llvm debug headers.

llvm generates some header files at build time that differ between
debug/release causing linker errors when you used the release headers
for a debug build.

===================================================================

M       build_files/build_environment/cmake/llvm.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/llvm.cmake 
b/build_files/build_environment/cmake/llvm.cmake
index 1aa31bc9d32..e3386b941ee 100644
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -47,7 +47,8 @@ if(MSVC)
                set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory 
${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
        else()
                set(LLVM_HARVEST_COMMAND
-                       ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ 
${HARVEST_TARGET}/llvm/debug/lib/
+                       ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ 
${HARVEST_TARGET}/llvm/debug/lib/ &&
+                       ${CMAKE_COMMAND} -E copy_directory 
${LIBDIR}/llvm/include/ ${HARVEST_TARGET}/llvm/debug/include/
                )
        endif()
        ExternalProject_Add_Step(ll after_install

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to