Commit: cef5841e124b8f1667d96b8338e6e2ac85d7c4c6
Author: Ray Molenkamp
Date: Wed Dec 21 13:25:02 2022 -0700
Branches: master
https://developer.blender.org/rBcef5841e124b8f1667d96b8338e6e2ac85d7c4c6
Cmake: Fix building with WITH_WINDOWS_BUNDLE_CRT Off
When building without WITH_WINDOWS_BUNDLE_CRT the manifest
did not contain the blender.shared dependentAssembly leading
to missing dll errors at blender startup.
===================================================================
M build_files/cmake/platform/platform_win32.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_win32.cmake
b/build_files/cmake/platform/platform_win32.cmake
index da418a27274..82bfa53b5a3 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -140,8 +140,8 @@ if(WITH_WINDOWS_BUNDLE_CRT)
install(FILES ${CMAKE_BINARY_DIR}/blender.crt.manifest DESTINATION
./blender.crt)
set(BUNDLECRT "<dependency><dependentAssembly><assemblyIdentity
type=\"win32\" name=\"blender.crt\" version=\"1.0.0.0\"
/></dependentAssembly></dependency>")
- set(BUNDLECRT "${BUNDLECRT}<dependency><dependentAssembly><assemblyIdentity
type=\"win32\" name=\"blender.shared\" version=\"1.0.0.0\"
/></dependentAssembly></dependency>")
endif()
+set(BUNDLECRT "${BUNDLECRT}<dependency><dependentAssembly><assemblyIdentity
type=\"win32\" name=\"blender.shared\" version=\"1.0.0.0\"
/></dependentAssembly></dependency>")
configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in
${CMAKE_CURRENT_BINARY_DIR}/blender.exe.manifest @ONLY)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
