Attempt to fetch Windows deps via CMake instead

This will respect existing installs, but download and compile from source if necessary.

Author: ISSOtm

.github/scripts/get_win_deps.ps1

@@ -15,9 +15,9 @@ function getlibrary ([string] $URI, [string] $filename, [string] $hash, [string]
 	Expand-Archive -DestinationPath $destdir $filename
 }
 
-getlibrary 'https://www.zlib.net/zlib132.zip' 'zlib.zip' 'e8bf55f3017aa181690990cb58a994e77885da140609fc8f94abe9b65d2cae28' .
-getlibrary 'https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.53.zip' 'libpng.zip' '9fb99118ec4523d9a9dab652ce7c2472ec76f6ccd69d1aba3ab873bb8cf84b98' .
-getlibrary 'https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip' 'winflexbison.zip' '8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135' install_dir
+#getlibrary 'https://www.zlib.net/zlib132.zip' 'zlib.zip' 'e8bf55f3017aa181690990cb58a994e77885da140609fc8f94abe9b65d2cae28' .
+#getlibrary 'https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.53.zip' 'libpng.zip' '9fb99118ec4523d9a9dab652ce7c2472ec76f6ccd69d1aba3ab873bb8cf84b98' .
+getlibrary 'https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip' 'winflexbison.zip' '8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135' bison
 
-Move-Item zlib-1.3.2 zlib
-Move-Item libpng-1.6.53 libpng
+#Move-Item zlib-1.3.2 zlib
+#Move-Item libpng-1.6.53 libpng

.github/workflows/testing.yml

@@ -3,6 +3,10 @@ on:
   - push
   - pull_request
 
+env:
+  CLICOLOR_FORCE: 1 # Makes CMake output colours.
+  CMAKE_COLOR_DIAGNOSTICS: ON # Makes CMake-generated build systems emit colour.
+
 jobs:
   unix:
     strategy:
@@ -31,7 +35,7 @@ jobs:
       - name: Build & install using CMake
         if: matrix.buildsys == 'cmake'
         run: |
-          cmake -S . -B build --preset develop -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DTESTS_OS_NAME=${{ matrix.os }}
+          cmake -S . -B build --preset develop -DFETCHCONTENT_BASE_DIR=/tmp/cmake_deps -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DTESTS_OS_NAME=${{ matrix.os }}
           cmake --build build -j --verbose
           sudo cmake --install build --verbose
       - name: Package binaries
@@ -147,37 +151,37 @@ jobs:
         uses: actions/checkout@v4
       - name: Install deps
         run: .github/scripts/get_win_deps.ps1
-      - name: Check libraries cache
-        id: cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            zbuild
-            pngbuild
-          key: ${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles('zlib/**', 'libpng/**') }}
-      - name: Build zlib
-        if: steps.cache.outputs.cache-hit != 'true'
-        shell: bash
-        run: | # BUILD_SHARED_LIBS causes the output DLL to be called `z.dll` as of zlib 1.3.2 (formerly `zlib1.dll`)
-          cmake -S zlib -B zbuild -A ${{ matrix.platform }} -Wno-dev -DCMAKE_INSTALL_PREFIX=install_dir -DBUILD_SHARED_LIBS=ON
-          cmake --build zbuild --config Debug -j
-      - name: Install zlib
-        run: |
-          cmake --install zbuild --config Debug
-      - name: Build libpng
-        if: steps.cache.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          cmake -S libpng -B pngbuild -A ${{ matrix.platform }} -Wno-dev -DCMAKE_INSTALL_PREFIX=install_dir -DCMAKE_BUILD_TYPE=Debug -DPNG_SHARED=ON -DPNG_STATIC=OFF -DPNG_TESTS=OFF
-          cmake --build pngbuild --config Debug -j
-      - name: Install libpng
-        run: |
-          cmake --install pngbuild --config Debug
+#      - name: Check libraries cache
+#        id: cache
+#        uses: actions/cache@v4
+#        with:
+#          path: |
+#            zbuild
+#            pngbuild
+#          key: ${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles('zlib/**', 'libpng/**') }}
+#      - name: Build zlib
+#        if: steps.cache.outputs.cache-hit != 'true'
+#        shell: bash
+#        run: | # BUILD_SHARED_LIBS causes the output DLL to be called `z.dll` as of zlib 1.3.2 (formerly `zlib1.dll`)
+#          cmake -S zlib -B zbuild -A ${{ matrix.platform }} -Wno-dev -DCMAKE_INSTALL_PREFIX=install_dir -DBUILD_SHARED_LIBS=ON
+#          cmake --build zbuild --config Debug -j
+#      - name: Install zlib
+#        run: |
+#          cmake --install zbuild --config Debug
+#      - name: Build libpng
+#        if: steps.cache.outputs.cache-hit != 'true'
+#        shell: bash
+#        run: |
+#          cmake -S libpng -B pngbuild -A ${{ matrix.platform }} -Wno-dev -DCMAKE_INSTALL_PREFIX=install_dir -DCMAKE_BUILD_TYPE=Debug -DPNG_SHARED=ON -DPNG_STATIC=OFF -DPNG_TESTS=OFF
+#          cmake --build pngbuild --config Debug -j
+#      - name: Install libpng
+#        run: |
+#          cmake --install pngbuild --config Debug
       - name: Build Windows binaries
         shell: bash
         run: | # ASan seems to be broken on Windows.
-          cmake -S . -B build -A ${{ matrix.platform }} --preset develop -DCMAKE_INSTALL_PREFIX=install_dir -DSANITIZERS=OFF
-          cmake --build build --config Debug -j --verbose
+          cmake -S . -B build -A ${{ matrix.platform }} --preset develop -DFETCHCONTENT_BASE_DIR="$TEMP/cmake-deps" -DBISON_EXECUTABLE=bison/win_bison.exe -DSANITIZERS=OFF
+          cmake --build build --config Debug -j 1
           cmake --install build --verbose
       - name: Package binaries
         shell: bash

CMakeLists.txt

@@ -136,15 +136,27 @@ endif()
 
 ## Dependencies.
 
-find_package(PkgConfig)
-if(MSVC OR NOT PKG_CONFIG_FOUND)
-  # fallback to find_package
-  # cmake's FindPNG is very fragile; it breaks when multiple versions are installed
-  # this is most evident on macOS but can occur on Linux too
-  find_package(PNG REQUIRED)
-else()
-  pkg_check_modules(LIBPNG REQUIRED IMPORTED_TARGET libpng)
-  add_library(PNG::PNG ALIAS PkgConfig::LIBPNG)
+include(FetchContent)
+FetchContent_Declare(PNG
+                     URL https://download.sourceforge.net/libpng/libpng-1.6.55.tar.xz
+                     URL_HASH SHA256=d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d
+                     FIND_PACKAGE_ARGS 1.5.4)
+FetchContent_Declare(ZLIB
+                     URL https://www.zlib.net/zlib-1.3.2.tar.xz
+                     URL_HASH SHA256=d7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3
+                     FIND_PACKAGE_ARGS)
+set(PNG_TESTS OFF CACHE INTERNAL "") # We do not care for these two (and they can even cause compile errors!)
+set(PNG_TOOLS OFF CACHE INTERNAL "")
+set(PNG_SHARED ON CACHE INTERNAL "") # Upstream seems to favour the dynamic lib over the static one?
+set(PNG_STATIC OFF CACHE INTERNAL "")
+FetchContent_MakeAvailable(ZLIB)
+if(NOT DEFINED ZLIB_INCLUDE_DIRS)
+  get_target_property(ZLIB_INCLUDE_DIRS ZLIB::ZLIB INCLUDE_DIRECTORIES) # libpng relies on this variable to be set.
+endif()
+execute_process(COMMAND sed -Ei "s/RESULT_VARIABLE/COMMAND_ECHO STDERR &/" "$ENV{TEMP}/cmake-deps/png-build/scripts/cmake/genout.cmake")
+FetchContent_MakeAvailable(PNG)
+if(NOT TARGET PNG::PNG)
+  add_library(PNG::PNG ALIAS png_shared)
 endif()
 
 ## The actual stuff.

src/CMakeLists.txt

@@ -13,7 +13,7 @@ target_compile_definitions(common PRIVATE "BUILD_VERSION_STRING=\"${GIT_REV}\"")
 
 find_package(BISON 3.0.0 REQUIRED)
 set(BISON_FLAGS "-Wall -Dlr.type=ielr")
-# Set some flags on versions that support them
+# Set some flags on versions that support them.
 if(BISON_VERSION VERSION_GREATER_EQUAL "3.5")
   set(BISON_FLAGS "${BISON_FLAGS} -Dparse.lac=full -Dapi.token.raw=true -Wdangling-alias")
 endif()