diff --git a/dependencies/wasm/CMakeLists.txt b/dependencies/wasm/CMakeLists.txt index fee716155c8c..6eb5ee38187a 100644 --- a/dependencies/wasm/CMakeLists.txt +++ b/dependencies/wasm/CMakeLists.txt @@ -16,7 +16,7 @@ if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") endif () if (WITH_WABT) - set(WABT_VER 1.0.29) + set(WABT_VER 1.0.30) message(STATUS "Fetching WABT ${WABT_VER}...") FetchContent_Declare(wabt @@ -47,9 +47,8 @@ if (WITH_WABT) target_include_directories(Halide_wabt SYSTEM # Use -isystem instead of -I; this is a trick so that clang-tidy won't analyze these includes INTERFACE - $ - $ - $) + $/include + $/include) set_target_properties(Halide_wabt PROPERTIES EXPORT_NAME wabt) endif () diff --git a/src/WasmExecutor.cpp b/src/WasmExecutor.cpp index b5750a30eb76..86f26f06883f 100644 --- a/src/WasmExecutor.cpp +++ b/src/WasmExecutor.cpp @@ -23,18 +23,18 @@ #include "Target.h" #if WITH_WABT -#include "wabt-src/src/binary-reader.h" -#include "wabt-src/src/cast.h" -#include "wabt-src/src/common.h" -#include "wabt-src/src/error-formatter.h" -#include "wabt-src/src/error.h" -#include "wabt-src/src/feature.h" -#include "wabt-src/src/interp/binary-reader-interp.h" -#include "wabt-src/src/interp/interp-util.h" -#include "wabt-src/src/interp/interp.h" -#include "wabt-src/src/interp/istream.h" -#include "wabt-src/src/result.h" -#include "wabt-src/src/stream.h" +#include "wabt/binary-reader.h" +#include "wabt/cast.h" +#include "wabt/common.h" +#include "wabt/error-formatter.h" +#include "wabt/error.h" +#include "wabt/feature.h" +#include "wabt/interp/binary-reader-interp.h" +#include "wabt/interp/interp-util.h" +#include "wabt/interp/interp.h" +#include "wabt/interp/istream.h" +#include "wabt/result.h" +#include "wabt/stream.h" #endif // clang-format off