[Bf-blender-cvs] [9a25a34e42f] master: shader_builder: fix build issue on windows
Ray Molenkamp
noreply at git.blender.org
Fri Apr 29 00:57:51 CEST 2022
Commit: 9a25a34e42faaeb5fad84c3a0c2d8d15b892278c
Author: Ray Molenkamp
Date: Thu Apr 28 16:57:46 2022 -0600
Branches: master
https://developer.blender.org/rB9a25a34e42faaeb5fad84c3a0c2d8d15b892278c
shader_builder: fix build issue on windows
shader_builder had no manifest set, leading
to the classic common control version being
loaded which in turn caused an import error
and made the executable fail to initialize.
===================================================================
M source/blender/gpu/CMakeLists.txt
===================================================================
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index a675b503f75..d0a3409b280 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -549,10 +549,17 @@ if(WITH_GPU_SHADER_BUILDER)
buildinfoobj
)
else()
+ if(WIN32)
+ # We can re-use the manifest from tests.exe here since it's
+ # rather generic and just selects the appropriate common
+ # controls version.
+ set(MANIFEST "${CMAKE_BINARY_DIR}/tests.exe.manifest")
+ endif()
add_executable(shader_builder
intern/gpu_shader_builder.cc
intern/gpu_shader_builder_stubs.cc
${shader_create_info_list_file}
+ ${MANIFEST}
)
target_link_libraries(shader_builder PUBLIC
More information about the Bf-blender-cvs
mailing list