Fixup CMake after spirv upgrade
Change-Id: I6c56f3d0c7680d487bf9ed0a5dff79a934dfd13a
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/73408
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 434fbb7..c5cd16d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -803,6 +803,7 @@
set(SPIRV-Headers_SOURCE_DIR "${THIRD_PARTY_DIR}/SPIRV-Headers")
set(SPIRV_SKIP_TESTS TRUE CACHE BOOL "" FORCE)
set(SPIRV_SKIP_EXECUTABLES TRUE CACHE BOOL "" FORCE)
+ set(SPIRV_WERROR FALSE CACHE BOOL "" FORCE)
add_subdirectory(${THIRD_PARTY_DIR}/SPIRV-Tools) # Add SPIRV-Tools target
endif()
diff --git a/src/Pipeline/CMakeLists.txt b/src/Pipeline/CMakeLists.txt
index c440a8c..374d424 100644
--- a/src/Pipeline/CMakeLists.txt
+++ b/src/Pipeline/CMakeLists.txt
@@ -74,8 +74,6 @@
set_target_properties(core_tables PROPERTIES FOLDER "SPIRV-Tools build")
set_target_properties(enum_string_mapping PROPERTIES FOLDER "SPIRV-Tools build")
set_target_properties(extinst_tables PROPERTIES FOLDER "SPIRV-Tools build")
-set_target_properties(spirv-tools-pkg-config PROPERTIES FOLDER "SPIRV-Tools build")
-set_target_properties(spirv-tools-shared-pkg-config PROPERTIES FOLDER "SPIRV-Tools build")
set_target_properties(vk_pipeline PROPERTIES
POSITION_INDEPENDENT_CODE 1
