diff options
| author | dan sinclair <dsinclair@chromium.org> | 2024-05-08 10:23:52 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@google.com> | 2024-05-08 17:29:21 +0000 |
| commit | da334852e70510d259bfa8cbaa7c5412966b2f41 (patch) | |
| tree | 353a06b3aed8c3f21e3ca9ae34da0b1d4ff2cb0c | |
| parent | a603abcea9f1ba9ab01dfdc00ab2e5dd5fe0e761 (diff) | |
| download | swiftshader-upstream-swiftshader-master.tar.gz | |
Fixup CMake after spirv upgradeupstream-swiftshader-master
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>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Pipeline/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 434fbb708..c5cd16d55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -803,6 +803,7 @@ if (NOT TARGET SPIRV-Tools) 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 c440a8c02..374d42467 100644 --- a/src/Pipeline/CMakeLists.txt +++ b/src/Pipeline/CMakeLists.txt @@ -74,8 +74,6 @@ endif() 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 |