Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2019-06-06 16:19:58 +0300
committerRay Molenkamp <github@lazydodo.com>2019-06-06 16:19:58 +0300
commitd8ec8a0272d56e4594be0de0a0ab0c8faef7d2bc (patch)
tree06c5689b049b41655970d98f1a0d5969f5b2a64a /build_files/cmake/macros.cmake
parent095df1ac217f3e43667f94ab189a67175bcd7af5 (diff)
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.
Diffstat (limited to 'build_files/cmake/macros.cmake')
-rw-r--r--build_files/cmake/macros.cmake2
1 files changed, 1 insertions, 1 deletions
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}")