From c0d144a2b09fc2f9e45e5fea260e10e3984f7cad Mon Sep 17 00:00:00 2001 From: Tobias Frisch <tfrisch@uni-koblenz.de> Date: Mon, 24 May 2021 20:06:49 +0200 Subject: [PATCH] [#36] Removed testing and C API targets and changed used library to the C++ specific Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de> --- config/lib/SPIRV_Cross.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/config/lib/SPIRV_Cross.cmake b/config/lib/SPIRV_Cross.cmake index 2c06dabe..751ee883 100644 --- a/config/lib/SPIRV_Cross.cmake +++ b/config/lib/SPIRV_Cross.cmake @@ -1,16 +1,21 @@ find_package(spirv_cross_c_shared QUIET) if (spirv-cross_FOUND) - list(APPEND vkcv_libraries spirv_cross_c_shared) + list(APPEND vkcv_libraries spirv-cross-cpp) - message(${vkcv_config_msg} " SPIRV Cross - ") + message(${vkcv_config_msg} " SPIRV Cross - " ${SPIRV_CROSS_VERSION}) else() if (EXISTS "${vkcv_lib_path}/SPIRV-Cross") + set(SPIRV_CROSS_CLI OFF CACHE INTERNAL "") + set(SPIRV_CROSS_ENABLE_TESTS OFF CACHE INTERNAL "") + set(SPIRV_CROSS_ENABLE_C_API OFF CACHE INTERNAL "") + set(SPIRV_CROSS_SKIP_INSTALL ON CACHE INTERNAL "") + add_subdirectory(${vkcv_lib}/SPIRV-Cross) - list(APPEND vkcv_libraries spirv_cross_c_shared) + list(APPEND vkcv_libraries spirv-cross-cpp) - message(${vkcv_config_msg} " SPIRV Cross - ") + message(${vkcv_config_msg} " SPIRV Cross - " ${SPIRV_CROSS_VERSION}) else() message(WARNING "SPIRV-Cross is required..! Update the submodules!") endif () -- GitLab