[Bf-blender-cvs] [886768a6991] master: CMake: correct linking order regression

Campbell Barton noreply at git.blender.org
Fri Aug 12 14:17:07 CEST 2022


Commit: 886768a699160e4228462f05e8313401aeac3cab
Author: Campbell Barton
Date:   Fri Aug 12 22:13:50 2022 +1000
Branches: master
https://developer.blender.org/rB886768a699160e4228462f05e8313401aeac3cab

CMake: correct linking order regression

Library sorting from [0] caused WITH_GPU_BUILDTIME_SHADER_BUILDER
to fail. It's possible there are missing dependencies that caused
the change in order to break, for now revert that change.

[0]: 19b5524d1c0c1c2ee78a8a75b8703b7cc72a8671

===================================================================

M	source/blender/gpu/CMakeLists.txt

===================================================================

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index ff12ae5054a..65a6a2dc6b7 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -645,9 +645,9 @@ if(WITH_GPU_BUILDTIME_SHADER_BUILDER)
 
   endif()
   target_link_libraries(shader_builder PUBLIC
-    bf_blenlib
     bf_gpu
     bf_intern_clog
+    bf_blenlib
     bf_intern_ghost
     ${PLATFORM_LINKLIBS}
   )



More information about the Bf-blender-cvs mailing list