[Bf-blender-cvs] [5236793d352] master: Build Environment: cleanup OpenColorIO duplicated and unused flags.

Brecht Van Lommel noreply at git.blender.org
Thu Aug 16 16:41:52 CEST 2018


Commit: 5236793d35213de14d8c1a8b61d1eec92c598730
Author: Brecht Van Lommel
Date:   Thu Aug 16 12:21:51 2018 +0200
Branches: master
https://developer.blender.org/rB5236793d35213de14d8c1a8b61d1eec92c598730

Build Environment: cleanup OpenColorIO duplicated and unused flags.

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

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 f3d7c2b4c7b..a51d189dfd4 100644
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -17,38 +17,26 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(OPENCOLORIO_EXTRA_ARGS
-	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-	-DBoost_USE_MULTITHREADED=ON
-	-DBoost_USE_STATIC_LIBS=ON
-	-DBoost_USE_STATIC_RUNTIME=ON
-	-DBOOST_ROOT=${LIBDIR}/boost
-	-DBOOST_INCLUDEDIR=${LIBDIR}/boost/include/boost_1_68/boost
-	-DBoost_NO_SYSTEM_PATHS=ON
-	-DBoost_DEBUG=ON
-	-DBoost_MAJOR_VERSION=1
-	-DBoost_MINOR_VERSION=60
 	-DOCIO_BUILD_APPS=OFF
 	-DOCIO_BUILD_PYGLUE=OFF
 	-DOCIO_BUILD_NUKE=OFF
+	-DOCIO_USE_BOOST_PTR=OFF
+	-DOCIO_BUILD_STATIC=ON
+	-DOCIO_BUILD_SHARED=OFF
+	-DOCIO_BUILD_TRUELIGHT=OFF
+	-DOCIO_BUILD_DOCS=OFF
+	-DOCIO_BUILD_PYGLUE=OFF
+	-DOCIO_BUILD_JNIGLUE=OFF
+	-DOCIO_STATIC_JNIGLUE=OFF
 )
 
 if(WIN32)
 	set(OCIO_PATCH opencolorio_win.diff)
 	set(OPENCOLORIO_EXTRA_ARGS
 		${OPENCOLORIO_EXTRA_ARGS}
-		-DOCIO_BUILD_SHARED=OFF
-		-DOCIO_BUILD_STATIC=ON
-		-DOCIO_BUILD_TRUELIGHT=OFF
-		-DOCIO_BUILD_APPS=OFF
-		-DOCIO_BUILD_NUKE=OFF
-		-DOCIO_BUILD_DOCS=OFF
 		-DOCIO_BUILD_TESTS=OFF
-		-DOCIO_BUILD_PYGLUE=OFF
-		-DOCIO_BUILD_JNIGLUE=OFF
-		-DOCIO_STATIC_JNIGLUE=OFF
 		-DOCIO_USE_SSE=ON
 		-DOCIO_INLINES_HIDDEN=OFF
-		-DOCIO_USE_BOOST_PTR=OFF
 		-DOCIO_PYGLUE_LINK=OFF
 		-DOCIO_PYGLUE_RESPECT_ABI=OFF
 		-DOCIO_PYGLUE_SONAME=OFF
@@ -67,9 +55,6 @@ else()
 	set(OCIO_PATCH opencolorio.diff)
 	set(OPENCOLORIO_EXTRA_ARGS
 		${OPENCOLORIO_EXTRA_ARGS}
-		-DOCIO_USE_BOOST_PTR=OFF
-		-DOCIO_BUILD_STATIC=ON
-		-DOCIO_BUILD_SHARED=OFF
 	)
 endif()



More information about the Bf-blender-cvs mailing list