update sirit-ci, fix zstd, update CPMUtil
Some checks failed
eden-license / license-header (pull_request) Failing after 27s
Some checks failed
eden-license / license-header (pull_request) Failing after 27s
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
parent
ee3f270fa4
commit
a415b41064
11 changed files with 36 additions and 289 deletions
15
externals/CMakeLists.txt
vendored
15
externals/CMakeLists.txt
vendored
|
@ -163,21 +163,8 @@ else()
|
|||
endif()
|
||||
|
||||
# SPIRV Headers
|
||||
# We only need SPIRV-Headers iff spirv-tools is bundled
|
||||
if (TARGET SPIRV-Headers::SPIRV-Headers)
|
||||
set(NEED_SPIRV_HEADERS OFF)
|
||||
elseif (SPIRV-Tools_FORCE_BUNDLED OR CPMUTIL_FORCE_BUNDLED)
|
||||
set(NEED_SPIRV_HEADERS ON)
|
||||
else()
|
||||
find_package(SPIRV-Tools QUIET)
|
||||
if (NOT SPIRV-Tools_FOUND)
|
||||
set(NEED_SPIRV_HEADERS ON)
|
||||
else()
|
||||
set(NEED_SPIRV_HEADERS OFF)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (NEED_SPIRV_HEADERS)
|
||||
if (NOT TARGET SPIRV-Headers::SPIRV-Headers)
|
||||
AddJsonPackage(spirv-headers)
|
||||
endif()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue