Mercurial > minori
changeset 345:d085c05247bd
build: fix windows build
| author | Paper <paper@paper.us.eu.org> |
|---|---|
| date | Thu, 20 Jun 2024 07:39:01 -0400 |
| parents | 676b9967d8c6 |
| children | e65b89bcc528 |
| files | .builds/windows.yml CMakeLists.txt |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.builds/windows.yml Thu Jun 20 06:00:28 2024 -0400 +++ b/.builds/windows.yml Thu Jun 20 07:39:01 2024 -0400 @@ -30,6 +30,7 @@ cd build64 sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status' python3 -m pip install --user --break-system-packages mingw-ldd + sudo ln -nfs "$HOME/quasi-msys2-win64/root/mingw64" /mingw64 bash -c 'export MSYSTEM=mingw64 && source ../../quasi-msys2-win64/env/all.src && cmake .. -G "Unix Makefiles" && make && env DIR=minori64 LDD="$HOME/.local/bin/mingw-ldd" sh ../scripts/win32/deploy_build.sh' - get-wine32: | sudo dpkg --add-architecture i386 @@ -46,6 +47,7 @@ mkdir build32 cd build32 sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status' + sudo ln -nfs "$HOME/quasi-msys2-win64/root/mingw32" /mingw32 bash -c 'export MSYSTEM=mingw32 && source ../../quasi-msys2-win32/env/all.src && cmake .. -G "Unix Makefiles" && make && env DIR=minori32 LDD="$HOME/.local/bin/mingw-ldd" sh ../scripts/win32/deploy_build.sh' artifacts: - minori/build64/minori64.zip
--- a/CMakeLists.txt Thu Jun 20 06:00:28 2024 -0400 +++ b/CMakeLists.txt Thu Jun 20 07:39:01 2024 -0400 @@ -31,7 +31,9 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools) -find_package(CURL REQUIRED) +# find_package(CURL) fails sometimes +find_package(PkgConfig REQUIRED) +pkg_check_modules(CURL REQUIRED curl) set(LIBRARIES ${CURL_LIBRARIES}