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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-08-16 13:21:51 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-08-16 16:51:08 +0300
commit5236793d35213de14d8c1a8b61d1eec92c598730 (patch)
tree7061eb8881677cc607d7a098c9aa6346cececf04 /build_files/build_environment/cmake
parent7a7c579dd9367783de5f1ea1a2bba91572e3009a (diff)
Build Environment: cleanup OpenColorIO duplicated and unused flags.
Diffstat (limited to 'build_files/build_environment/cmake')
-rw-r--r--build_files/build_environment/cmake/opencolorio.cmake31
1 files changed, 8 insertions, 23 deletions
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()