[Bf-blender-cvs] [d8ec8a0272d] master: Fix: Build error with ninja on windows

Ray Molenkamp noreply at git.blender.org
Thu Jun 6 15:20:04 CEST 2019


Commit: d8ec8a0272d56e4594be0de0a0ab0c8faef7d2bc
Author: Ray Molenkamp
Date:   Thu Jun 6 07:19:58 2019 -0600
Branches: master
https://developer.blender.org/rBd8ec8a0272d56e4594be0de0a0ab0c8faef7d2bc

Fix: Build error with ninja on windows

Ninja has issues detecting the implicit dependency on the
precompiled header output for freestyle. Disabled ninja
support for now until a proper solution can be found.

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

M	build_files/cmake/macros.cmake

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 2da05dc3cb7..d1894ad8f24 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1222,7 +1222,7 @@ macro(WINDOWS_SIGN_TARGET target)
 endmacro()
 
 macro(blender_precompile_headers target cpp header)
-  if (MSVC AND NOT MSVC_CLANG)
+  if (MSVC AND NOT ${CMAKE_GENERATOR} STREQUAL "Ninja")
     target_sources(${target} PRIVATE ${cpp} ${header})
     set_target_properties(${target} PROPERTIES COMPILE_FLAGS "/Yu${header} /FI${header}")
     set_source_files_properties(${cpp} PROPERTIES COMPILE_FLAGS "/Yc${header}")



More information about the Bf-blender-cvs mailing list