diff options
author | Ray Molenkamp <github@lazydodo.com> | 2022-07-15 11:51:46 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2022-07-15 11:54:10 +0300 |
commit | c2715dc41664781924f610d9c5c03362ccb29446 (patch) | |
tree | 9b7f8c444053b4c4f0af527ecdc306b48081bb8a /source | |
parent | 63ea0f7581faeeb629b040b7a4dc661bc84c789c (diff) |
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.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 18 |
1 files changed, 8 insertions, 10 deletions
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) |