From caae21ae5d30736c1135951f82b4cd1bfc443736 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Wed, 16 Aug 2023 07:13:25 -0700 Subject: [PATCH] instruct ci to install xmldump when it is built --- .github/workflows/build-linux.yml | 1 + .github/workflows/build-windows.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 2f052b53e..9e377a3c7 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -124,6 +124,7 @@ jobs: -DBUILD_DOCS_NO_HTML:BOOL=${{ !inputs.html }} \ -DBUILD_TESTS:BOOL=${{ inputs.tests }} \ -DBUILD_XMLDUMP:BOOL=${{ inputs.xml-dump-type-sizes }} \ + -DINSTALL_XMLDUMP:BOOL=1 \ -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} \ -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} - name: Build DFHack diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 6469d5be7..e1039b6ff 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -94,7 +94,7 @@ jobs: win-msvc - name: Cross-compile env: - CMAKE_EXTRA_ARGS: '-DBUILD_LIBRARY=${{ inputs.platform-files }} -DBUILD_STONESENSE:BOOL=${{ inputs.stonesense }} -DBUILD_DOCS:BOOL=${{ inputs.docs }} -DBUILD_DOCS_NO_HTML:BOOL=${{ !inputs.html }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DBUILD_DFLAUNCH:BOOL=${{ inputs.launchdf }} -DBUILD_TESTS:BOOL=${{ inputs.tests }} -DBUILD_XMLDUMP:BOOL=${{ inputs.xml-dump-type-sizes }}' + CMAKE_EXTRA_ARGS: '-DBUILD_LIBRARY=${{ inputs.platform-files }} -DBUILD_STONESENSE:BOOL=${{ inputs.stonesense }} -DBUILD_DOCS:BOOL=${{ inputs.docs }} -DBUILD_DOCS_NO_HTML:BOOL=${{ !inputs.html }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DBUILD_DFLAUNCH:BOOL=${{ inputs.launchdf }} -DBUILD_TESTS:BOOL=${{ inputs.tests }} -DBUILD_XMLDUMP:BOOL=${{ inputs.xml-dump-type-sizes }} -DINSTALL_XMLDUMP:BOOL=1' run: | cd build bash -x build-win64-from-linux.sh