[Bf-blender-cvs] [4b0b91aee07] master: build_environment: small fix for building ocio on windows.
Ray Molenkamp
noreply at git.blender.org
Fri Aug 17 01:42:53 CEST 2018
Commit: 4b0b91aee076f0dbd24fe737c759b132903d1aa8
Author: Ray Molenkamp
Date: Thu Aug 16 17:42:06 2018 -0600
Branches: master
https://developer.blender.org/rB4b0b91aee076f0dbd24fe737c759b132903d1aa8
build_environment: small fix for building ocio on windows.
===================================================================
M build_files/build_environment/cmake/opencolorio.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/opencolorio.cmake b/build_files/build_environment/cmake/opencolorio.cmake
index a51d189dfd4..a99b1f118cb 100644
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -50,6 +50,8 @@ if(WIN32)
-DUSE_EXTERNAL_LCMS=ON
-DINC_1=${LIBDIR}/tinyxml/include
-DINC_2=${LIBDIR}/yamlcpp/include
+ #lie because ocio cmake is demanding boost even though it is not needed
+ -DYAML_CPP_VERSION=0.5.0
)
else()
set(OCIO_PATCH opencolorio.diff)
@@ -87,6 +89,7 @@ if(WIN32)
external_opencolorio
external_tinyxml
external_yamlcpp
+
)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_opencolorio after_install
More information about the Bf-blender-cvs
mailing list