From c2715dc41664781924f610d9c5c03362ccb29446 Mon Sep 17 00:00:00 2001
From: Ray Molenkamp <github@lazydodo.com>
Date: Fri, 15 Jul 2022 10:51:46 +0200
Subject: GPU: Remove USD dependency from shader_builder.

Dependency was added as shader builder depended to blenkernel as an
umbrella, in stead of adding the actual dependencies it required.
---
 CMakeLists.txt                    |  6 ------
 source/blender/gpu/CMakeLists.txt | 18 ++++++++----------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b7ee7f1887..33064864be6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1340,12 +1340,6 @@ else()
   list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
 endif()
 
-if (WITH_GPU_BUILDTIME_SHADER_BUILDER AND WITH_USD)
-  message(FATAL_ERROR
-    "Unable to compile WITH_GPU_BUILDTIME_SHADER_BUILDER and WITH_USD."
-  )
-endif()
-
 #-----------------------------------------------------------------------------
 # Configure Metal.
 if (WITH_METAL_BACKEND)
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 1c883f7fa41..0cb92e02515 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -570,11 +570,7 @@ if(WITH_GPU_BUILDTIME_SHADER_BUILDER)
       )
 
     setup_platform_linker_flags(shader_builder)
-
-    target_link_libraries(shader_builder PUBLIC
-      bf_blenkernel
-      buildinfoobj
-    )
+    target_link_libraries(shader_builder PUBLIC buildinfoobj)
   else()
     if(WIN32)
       # We can re-use the manifest from tests.exe here since it's
@@ -589,12 +585,14 @@ if(WITH_GPU_BUILDTIME_SHADER_BUILDER)
       ${MANIFEST}
     )
 
-    target_link_libraries(shader_builder PUBLIC
-      bf_blenkernel
-      ${PLATFORM_LINKLIBS}
-    )
   endif()
-
+  target_link_libraries(shader_builder PUBLIC
+    bf_gpu
+    bf_intern_clog
+    bf_blenlib
+    bf_intern_ghost
+    ${PLATFORM_LINKLIBS}
+  )
   target_include_directories(shader_builder PRIVATE ${INC} ${CMAKE_CURRENT_BINARY_DIR})
 
   set(SRC_BAKED_CREATE_INFOS_FILE ${CMAKE_CURRENT_BINARY_DIR}/shader_baked.hh)
-- 
cgit v1.2.3