tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

CMake/CPack: Fix windows distribution 

the revert in 282944caac was incomplete
this commit restores the missing bits needed to make blender run
again.
This commit is contained in:
Ray Molenkamp 2023-08-13 22:21:12 -06:00
parent bf001961f3
commit deb4aa88b0
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/cmake/macros.cmake
View File

@ -1561,7 +1561,7 @@ macro(windows_generate_shared_manifest)
)
install(
FILES ${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest
DESTINATION ${CMAKE_INSTALL_PREFIX}/blender.shared
DESTINATION "./blender.shared"
CONFIGURATIONS Debug
)
endif()
@ -1573,7 +1573,7 @@ macro(windows_generate_shared_manifest)
)
install(
FILES ${CMAKE_BINARY_DIR}/Release/blender.shared.manifest
DESTINATION ${CMAKE_INSTALL_PREFIX}/blender.shared
DESTINATION "./blender.shared"
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
)
endif()

17
build_files/cmake/platform/platform_win32.cmake
View File

@ -134,19 +134,11 @@ if(WITH_WINDOWS_BUNDLE_CRT)
string(FIND ${lib} "ucrtbase" pos)
if(NOT pos EQUAL -1)
list(REMOVE_ITEM CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${lib})
install(
FILES ${lib}
DESTINATION ${CMAKE_INSTALL_PREFIX}
COMPONENT Libraries
)
install(FILES ${lib} DESTINATION . COMPONENT Libraries)
endif()
endforeach()
# Install the CRT to the blender.crt Sub folder.
install(
FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
DESTINATION ${CMAKE_INSTALL_PREFIX}/blender.crt
COMPONENT Libraries
)
install(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ./blender.crt COMPONENT Libraries)
windows_generate_manifest(
FILES "${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}"
@ -154,10 +146,7 @@ if(WITH_WINDOWS_BUNDLE_CRT)
NAME "blender.crt"
)
install(
FILES ${CMAKE_BINARY_DIR}/blender.crt.manifest
DESTINATION ${CMAKE_INSTALL_PREFIX}/blender.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>")
endif()
if(NOT WITH_PYTHON_MODULE)