From adaf7794672664a594038abc51ab34313b4581e0 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 24 Jun 2021 23:43:15 +0300 Subject: [PATCH 60/60] CI: Build Qt6 version again in MacOS See osdn #42249 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 2 +- scripts/ci-build.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3919506c44..da2c6c814a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: sdl2_image \ sdl2_mixer \ sdl2_ttf \ - qt@5 + qt@6 - name: build shell: bash run: ./scripts/ci-build.sh os_x diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 04e20a65fc..5c8e8812cf 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -39,16 +39,18 @@ ninja install "os_x") # gcc is an alias for clang on OS X -export PATH="/usr/local/opt/gettext/bin:/usr/local/opt/icu4c/bin:$(brew --prefix qt@5)/bin:$PATH" -export CPPFLAGS="-I/usr/local/opt/gettext/include -I/usr/local/opt/icu4c/include -I$(brew --prefix qt@5)/include $CPPFLAGS" -export LDFLAGS="-L/usr/local/opt/gettext/lib -L/usr/local/opt/icu4c/lib -L$(brew --prefix qt@5)/lib" +export PATH="/usr/local/opt/gettext/bin:/usr/local/opt/icu4c/bin:$(brew --prefix qt@6)/bin:$PATH" +export CPPFLAGS="-I/usr/local/opt/gettext/include -I/usr/local/opt/icu4c/include -I$(brew --prefix qt@6)/include $CPPFLAGS" +export LDFLAGS="-L/usr/local/opt/gettext/lib -L/usr/local/opt/icu4c/lib -L$(brew --prefix qt@6)/lib" export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH" +export MOCCMD=$(find /usr/local/Cellar/qt -name "moc" | head -n 1) + mkdir build cd build ../autogen.sh --no-configure-run ../configure \ - --enable-sys-lua \ + --enable-sys-lua --with-qt6 \ --enable-client=gtk3.22,sdl2,qt \ --enable-fcmp=gtk3,gtk4,qt,cli \ --enable-freeciv-manual \ -- 2.30.2