[Bf-blender-cvs] [cfd23f014a8] master: build_environment/Windows: Copy llvm debug headers.
Ray Molenkamp
noreply at git.blender.org
Fri Mar 8 15:20:02 CET 2019
Commit: cfd23f014a89afb27e3658c54d7e121f2d1af4f5
Author: Ray Molenkamp
Date: Fri Mar 8 06:59:54 2019 -0700
Branches: master
https://developer.blender.org/rBcfd23f014a89afb27e3658c54d7e121f2d1af4f5
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
More information about the Bf-blender-cvs
mailing list