BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix spirv-tools dependency

Browse source
This commit is contained in:
Moritz Heinemann 2023-11-20 22:01:58 +01:00 • committed by arcady-lunarg
parent 854db99ff1
commit eac012fff3
3 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SPIRV/CMakeLists.txt
View file

@ -106,11 +106,7 @@ if(WIN32 AND BUILD_SHARED_LIBS)
endif() endif()
if(ENABLE_OPT) if(ENABLE_OPT)
target_include_directories(SPIRV target_link_libraries(SPIRV PRIVATE MachineIndependent PUBLIC SPIRV-Tools-opt)
PRIVATE ${spirv-tools_SOURCE_DIR}/include
PRIVATE ${spirv-tools_SOURCE_DIR}/source
)
target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
target_include_directories(SPIRV PUBLIC target_include_directories(SPIRV PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)

6
StandAlone/CMakeLists.txt
View file

@ -76,12 +76,6 @@ target_include_directories(glslang-standalone PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
if(ENABLE_OPT)
target_include_directories(glslang-standalone
PRIVATE ${spirv-tools_SOURCE_DIR}/include
)
endif()
if(ENABLE_SPVREMAPPER) if(ENABLE_SPVREMAPPER)
set(REMAPPER_SOURCES spirv-remap.cpp) set(REMAPPER_SOURCES spirv-remap.cpp)
add_executable(spirv-remap ${REMAPPER_SOURCES}) add_executable(spirv-remap ${REMAPPER_SOURCES})

4
gtests/CMakeLists.txt
View file

@ -97,8 +97,8 @@ if(BUILD_TESTING)
${gtest_SOURCE_DIR}/include) ${gtest_SOURCE_DIR}/include)
if(ENABLE_OPT) if(ENABLE_OPT)
target_include_directories(glslangtests target_link_libraries(glslangtests
PRIVATE ${spirv-tools_SOURCE_DIR}/include PRIVATE SPIRV-Tools-opt
) )
endif() endif()