Commit: 011f3dde485def927252ea977078c8ff60852fed
Author: Ray Molenkamp
Date: Tue Dec 6 17:43:16 2022 -0700
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB011f3dde485def927252ea977078c8ff60852fed
deps builder: dynamic ocio and py bindings on windows
===================================================================
M build_files/build_environment/cmake/opencolorio.cmake
M build_files/build_environment/cmake/options.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/opencolorio.cmake
b/build_files/build_environment/cmake/opencolorio.cmake
index fbf1a9f6354..17336c73ddb 100644
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -47,11 +47,16 @@ if(BLENDER_PLATFORM_ARM)
endif()
if(WIN32)
+ set(OPENCOLORIO_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIMATH_DLL")
+ if(BUILD_MODE STREQUAL Debug)
+ set(OPENCOLORIO_CXX_FLAGS "${OPENCOLORIO_CXX_FLAGS} -DPy_DEBUG")
+ endif()
set(OPENCOLORIO_EXTRA_ARGS
${OPENCOLORIO_EXTRA_ARGS}
- -Dexpat_LIBRARY=${LIBDIR}/expat/lib/libexpatMD
- -DImath_LIBRARY=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}
- -DCMAKE_CXX_FLAGS=-DIMATH_DLL
+ -DCMAKE_DEBUG_POSTFIX=_d
+
-Dexpat_LIBRARY=${LIBDIR}/expat/lib/libexpat$<$<STREQUAL:${BUILD_MODE},Debug>:d>MD${LIBEXT}
+
-DImath_LIBRARY=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+ -DCMAKE_CXX_FLAGS=${OPENCOLORIO_CXX_FLAGS}
)
else()
set(OPENCOLORIO_EXTRA_ARGS
@@ -86,20 +91,16 @@ if(WIN32)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_opencolorio after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include
${HARVEST_TARGET}/opencolorio/include
+ COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/opencolorio/bin/OpenColorIO_2_2.dll
${HARVEST_TARGET}/opencolorio/bin/OpenColorIO_2_2.dll
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib
${HARVEST_TARGET}/opencolorio/lib
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/yaml-cpp.lib
${HARVEST_TARGET}/opencolorio/lib/yaml-cpp.lib
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatMD.lib
${HARVEST_TARGET}/opencolorio/lib/libexpatMD.lib
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pystring/lib/pystring.lib
${HARVEST_TARGET}/opencolorio/lib/pystring.lib
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/minizipng/lib/libminizip.lib
${HARVEST_TARGET}/opencolorio/lib/libminizip.lib
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_opencolorio after_install
- COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/opencolorio/lib/Opencolorio.lib
${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/yaml-cppd.lib
${HARVEST_TARGET}/opencolorio/lib/yaml-cppd.lib
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatdMD.lib
${HARVEST_TARGET}/opencolorio/lib/libexpatdMD.lib
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pystring/lib/pystring.lib
${HARVEST_TARGET}/opencolorio/lib/pystring_d.lib
+ COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/opencolorio/bin/OpenColorIO_d_2_2.dll
${HARVEST_TARGET}/opencolorio/bin/OpenColorIO_d_2_2.dll
+ COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/opencolorio/lib/Opencolorio_d.lib
${HARVEST_TARGET}/opencolorio/lib/OpenColorIO_d.lib
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/opencolorio/lib/site-packages
${HARVEST_TARGET}/opencolorio/lib/site-packages-debug
DEPENDEES install
)
endif()
diff --git a/build_files/build_environment/cmake/options.cmake
b/build_files/build_environment/cmake/options.cmake
index 3d3e34e8444..44eca741e77 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -55,7 +55,7 @@ if(WIN32)
string(APPEND COMMON_MSVC_FLAGS " /cgthreads1 ")
if(WITH_OPTIMIZED_DEBUG)
- set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2
/DNDEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+ set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2
/D_DEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
else()
set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od
/RTC1 /D_DEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
endif()
@@ -64,7 +64,7 @@ if(WIN32)
set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2
/Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
if(WITH_OPTIMIZED_DEBUG)
- set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS}
/D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /O2 /Ob2 /D NDEBUG /D
PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS
/DBOOST_DEBUG_PYTHON /DBOOST_ALL_NO_LIB")
+ set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS}
/D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /O2 /Ob2 /D_DEBUG /D PLATFORM_WINDOWS
/DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_DEBUG_PYTHON
/DBOOST_ALL_NO_LIB")
else()
set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS
/D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /MTd ${COMMON_MSVC_FLAGS} /Zi /Ob0
/Od /RTC1 /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS
/DBOOST_DEBUG_PYTHON /DBOOST_ALL_NO_LIB")
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
