From 99671b8eb50d68739c109d91f82b3c6334aa2b19 Mon Sep 17 00:00:00 2001 From: Eldred Habert Date: Tue, 21 Nov 2023 15:54:22 +0100 Subject: [PATCH] Avoid building test support programs by default with CMake (#1244) Copy CMake-built test executables to test directory Fixes CI failures on Windows. CI should also have failed on Unices, but it turns out we instead merely hit the fallback that the `make` path relies on (building those executables with `make`), which fails on Windows since `make` is not set up to find libpng. --- .github/workflows/testing.yml | 2 ++ test/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 30d5290d..388b508e 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -41,6 +41,7 @@ jobs: cmake --build build -j --verbose cp build/src/rgb{asm,link,fix,gfx} . sudo cmake --install build --verbose + cmake --install build --verbose --component "Test support programs" - name: Package binaries run: | mkdir bins @@ -122,6 +123,7 @@ jobs: cmake -S . -B build -A ${{ matrix.platform }} -DCMAKE_INSTALL_PREFIX=install_dir -DCMAKE_BUILD_TYPE=Release -DZLIB_LIBRARY="$PWD"/install_dir/lib/zlib.lib -DZLIB_INCLUDE_DIR="$PWD"/install_dir/include -DPNG_LIBRARY="$PWD"/install_dir/lib/libpng16.lib -DPNG_INCLUDE_DIR="$PWD"/install_dir/include cmake --build build --config Release -j --verbose cmake --install build --verbose --prefix install_dir + cmake --install build --verbose --component "Test support programs" - name: Package binaries shell: bash run: | diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index dd3fc8ff..ef0b87df 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,7 +3,7 @@ add_executable(randtilegen gfx/randtilegen.cpp) add_executable(rgbgfx_test gfx/rgbgfx_test.cpp) -install(TARGETS randtilegen rgbgfx_test DESTINATION ${rgbds_SOURCE_DIR}/test/gfx) +install(TARGETS randtilegen rgbgfx_test DESTINATION ${rgbds_SOURCE_DIR}/test/gfx COMPONENT "Test support programs" EXCLUDE_FROM_ALL) foreach(TARGET randtilegen rgbgfx_test) if(LIBPNG_FOUND) # pkg-config