[Bf-blender-cvs] [f058e870aff] tmp_libupdate_34: fix build issue on bots
Ray Molenkamp
noreply at git.blender.org
Sun Aug 21 09:59:11 CEST 2022
Commit: f058e870afff141157328503229fc2512de71204
Author: Ray Molenkamp
Date: Sun Aug 21 01:59:04 2022 -0600
Branches: tmp_libupdate_34
https://developer.blender.org/rBf058e870afff141157328503229fc2512de71204
fix build issue on bots
- Manifest should only be generated on windows
- Boost dll's should only be installed when they exist
===================================================================
M source/creator/CMakeLists.txt
===================================================================
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 42220e8541b..cc69aaf02ff 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1337,14 +1337,16 @@ if(WIN32 AND WITH_BOOST)
python${_PYTHON_VERSION_NO_DOTS} numpy${_PYTHON_VERSION_NO_DOTS}
)
foreach(component ${BOOST_COMPONENTS})
- windows_install_shared_manifest(
- FILES ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_${component}-${BOOST_POSTFIX}.dll
- RELEASE
- )
- windows_install_shared_manifest(
- FILES ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_${component}-${BOOST_DEBUG_POSTFIX}.dll
- DEBUG
- )
+ if(EXISTS ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_${component}-${BOOST_POSTFIX}.dll)
+ windows_install_shared_manifest(
+ FILES ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_${component}-${BOOST_POSTFIX}.dll
+ RELEASE
+ )
+ windows_install_shared_manifest(
+ FILES ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_${component}-${BOOST_DEBUG_POSTFIX}.dll
+ DEBUG
+ )
+ endif()
endforeach()
endif()
@@ -1388,8 +1390,9 @@ endif()
# -----------------------------------------------------------------------------
# Windows shared library manifest
-windows_generate_shared_manifest()
-
+if(WIN32)
+ windows_generate_shared_manifest()
+endif()
# -----------------------------------------------------------------------------
# Post-install script
More information about the Bf-blender-cvs
mailing list