diff options
| author | dan sinclair <dsinclair@chromium.org> | 2024-05-08 17:39:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-05-08 17:39:45 +0000 |
| commit | d7af93edd97050ca675499c14b34f93b2b329ab7 (patch) | |
| tree | 353a06b3aed8c3f21e3ca9ae34da0b1d4ff2cb0c | |
| parent | 990ae2652b41f1ebbff27cc4636d03649b9e66df (diff) | |
| parent | da334852e70510d259bfa8cbaa7c5412966b2f41 (diff) | |
| download | swiftshader-testing.tar.gz | |
Fixup CMake after spirv upgrade am: da334852e7swiftshader-testing
Original change: undetermined
Change-Id: Id30deffc0e8afad9d16cbd9789724299f90f1238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.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 |