Fixup build issues.
This CL adds some override decorations for various destructors and turns of Werror for the spirv-tools build. Change-Id: I10ac72cfaee247334f6db2918230283b1f975955 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/41420 Commit-Queue: dan sinclair <dsinclair@chromium.org> Commit-Queue: Ben Clayton <bclayton@google.com> Auto-Submit: dan sinclair <dsinclair@chromium.org> Reviewed-by: Ben Clayton <bclayton@google.com> Reviewed-by: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
parent
22a9f175e0
commit
c2118b0dcb
|
@ -35,7 +35,7 @@ template <typename BODY>
|
||||||
class TestHelperBase : public BODY, public ProgramBuilder {
|
class TestHelperBase : public BODY, public ProgramBuilder {
|
||||||
public:
|
public:
|
||||||
TestHelperBase() = default;
|
TestHelperBase() = default;
|
||||||
~TestHelperBase() = default;
|
~TestHelperBase() override = default;
|
||||||
|
|
||||||
/// Builds and returns a GeneratorImpl from the program.
|
/// Builds and returns a GeneratorImpl from the program.
|
||||||
/// @note The generator is only built once. Multiple calls to Build() will
|
/// @note The generator is only built once. Multiple calls to Build() will
|
||||||
|
|
|
@ -34,7 +34,7 @@ template <typename BASE>
|
||||||
class TestHelperBase : public BASE, public ProgramBuilder {
|
class TestHelperBase : public BASE, public ProgramBuilder {
|
||||||
public:
|
public:
|
||||||
TestHelperBase() = default;
|
TestHelperBase() = default;
|
||||||
~TestHelperBase() = default;
|
~TestHelperBase() override = default;
|
||||||
|
|
||||||
/// Builds and returns a GeneratorImpl from the program.
|
/// Builds and returns a GeneratorImpl from the program.
|
||||||
/// @note The generator is only built once. Multiple calls to Build() will
|
/// @note The generator is only built once. Multiple calls to Build() will
|
||||||
|
|
|
@ -33,7 +33,7 @@ class TestHelperBase : public BASE, public ProgramBuilder {
|
||||||
public:
|
public:
|
||||||
TestHelperBase() : td(this) {}
|
TestHelperBase() : td(this) {}
|
||||||
|
|
||||||
~TestHelperBase() = default;
|
~TestHelperBase() override = default;
|
||||||
|
|
||||||
/// Builds and returns a GeneratorImpl from the program.
|
/// Builds and returns a GeneratorImpl from the program.
|
||||||
/// @note The generator is only built once. Multiple calls to Build() will
|
/// @note The generator is only built once. Multiple calls to Build() will
|
||||||
|
|
|
@ -23,6 +23,7 @@ if(${TINT_BUILD_SPV_READER} OR ${TINT_BUILD_SPV_WRITER})
|
||||||
|
|
||||||
if (NOT TARGET SPIRV-Tools)
|
if (NOT TARGET SPIRV-Tools)
|
||||||
set(SPIRV_SKIP_TESTS ON CACHE BOOL ON)
|
set(SPIRV_SKIP_TESTS ON CACHE BOOL ON)
|
||||||
|
set(SPIRV_WERROR OFF CACHE BOOL OFF)
|
||||||
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools EXCLUDE_FROM_ALL)
|
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools EXCLUDE_FROM_ALL)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue