summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2022-03-06 16:48:03 +0000
committerGitHub <noreply@github.com>2022-03-06 08:48:03 -0800
commitf94830cd36b728f01ef7eef1ef3608b2a8945cdc (patch)
tree4d0f1562d5341f228e972013f2899da3ef434c98
parent37d60d4be3e92ac03245d48ebec4cef5fdce4770 (diff)
downloadwabt-f94830cd36b728f01ef7eef1ef3608b2a8945cdc.tar.gz
wabt-f94830cd36b728f01ef7eef1ef3608b2a8945cdc.tar.bz2
wabt-f94830cd36b728f01ef7eef1ef3608b2a8945cdc.zip
Fix location in config.h in source list (#1807)
The wrong name here was causing a cmake warning because it was finding `config.h.in` instead and this behaviour is deprecated.
-rw-r--r--.github/workflows/build.yml4
-rw-r--r--CMakeLists.txt4
2 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e707d57b..45fe876f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,11 +50,11 @@ jobs:
- name: mkdir
run: mkdir -p out
- name: cmake
- run: cmake .. -G Ninja -DWERROR=ON
+ run: cmake .. -G Ninja -DWERROR=ON -Werror=dev
working-directory: out
if: matrix.os != 'windows-latest'
- name: cmake (windows)
- run: cmake .. -DWERROR=ON
+ run: cmake .. -DWERROR=ON -Werror=dev
working-directory: out
if: matrix.os == 'windows-latest'
- name: build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5d2b96e..b69483f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,6 +256,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${WABT_SOURCE_DIR}/cmake)
add_custom_target(everything)
set(WABT_LIBRARY_SRC
+ ${WABT_BINARY_DIR}/config.h
+
src/apply-names.h
src/apply-names.cc
src/binary.h
@@ -276,7 +278,7 @@ set(WABT_LIBRARY_SRC
src/color.cc
src/common.h
src/common.cc
- src/config.h
+ src/config.h.in
src/config.cc
src/decompiler.h
src/decompiler-ast.h