qt663 with cmake 3.39.0 (#111)

qt663 with cmake 3.39.0
MerginMaps · Apr 15, 2024 · ea885a7 · ea885a7
1 parent f2b7ae5
commit ea885a7
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 31 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -33,16 +33,17 @@ jobs:
             QT_ARCH: 'android_arm64_v8a'
             ANDROID_ABI: 'arm64-v8a'
 
-    runs-on: macos-12
+    runs-on: macos-13
     env: # update README for devs if you modify these env. variables
-      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
       ANDROIDAPI: 24
       NDK_VERSION: '25.1.8937393'
       NDK_VERSION_FULL: r25b
       JDK_VERSION: 11
       SDK_PLATFORM: android-33
       SDK_BUILD_TOOLS: 33.0.1
-      XC_VERSION: ${{ '14.2' }}
+      XC_VERSION: ${{ '15.2' }}
+      CMAKE_VERSION: '3.29.0'
       VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
 
     steps:
@@ -53,14 +54,19 @@ jobs:
       - name: Prepare vars
         id: vars
         run: |
-          brew install automake bison flex gnu-sed autoconf-archive libtool gettext cmake ninja
+          brew install automake bison flex gnu-sed autoconf-archive libtool gettext
           echo $(brew --prefix bison)/bin >> $GITHUB_PATH
           echo $(brew --prefix flex)/bin >> $GITHUB_PATH
           echo $(brew --prefix gettext)/bin >> $GITHUB_PATH
 
           pip3 install -U pip
           pip3 install aqtinstall
 
+      - name: Install CMake and Ninja
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: ${{ env.CMAKE_VERSION }}
+
       - name: Setup compiler
         uses: maxim-lobanov/setup-xcode@v1
         with:

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -25,11 +25,12 @@ jobs:
   ios_build:
     runs-on: macos-13
     env: # update README for devs if you modify these env. variables
-      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
       TRIPLET: "arm64-ios"
       DEPLOYMENT_TARGET: '13.0' # iOS Deployment target 
       XC_VERSION: ${{ '15.2' }}
       QT_ARCH: "ios"
+      CMAKE_VERSION: '3.29.0'
       VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
 
     steps:
@@ -45,22 +46,19 @@ jobs:
       - name: Prepare vars
         id: vars
         run: |
-          brew install automake bison flex gnu-sed autoconf-archive libtool gettext cmake ninja
+          brew install automake bison flex gnu-sed autoconf-archive libtool gettext
           echo $(brew --prefix bison)/bin >> $GITHUB_PATH
           echo $(brew --prefix flex)/bin >> $GITHUB_PATH
           echo $(brew --prefix gettext)/bin >> $GITHUB_PATH
 
-          # With cmake 2.29.2 there is an build error when building tiff (in webp include dir)
-          # see https://github.com/MerginMaps/mobile-sdk/actions/runs/8568041959/job/23484551008 
-          # force back older cmake 3.28.2 which was working before
-          brew remove cmake
-          curl -o cmake.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/de4b578b0e7150fb1a2361cbac5ba599c7a3bacd/Formula/c/cmake.rb
-          brew install cmake.rb
-          cmake --version
-
           pip3 install -U pip
           pip3 install aqtinstall
 
+      - name: Install CMake and Ninja
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: ${{ env.CMAKE_VERSION }}
+
       - name: Restore cached Qt
         id: cache-qt-restore
         uses: actions/cache/restore@v3
@@ -118,6 +116,7 @@ jobs:
           export PATH=${{ env.VCPKG_ROOT }}:$PATH
 
           vcpkg --version
+          cmake --version
 
           cmake -B ${{ github.workspace }}/build \
                 -S ${{ github.workspace }}/input-sdk \

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -26,9 +26,10 @@ jobs:
     runs-on: ubuntu-22.04
 
     env: # update README for devs if you modify these env. variables
-      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
       TRIPLET: "x64-linux"
       QT_ARCH: "desktop"
+      CMAKE_VERSION: '3.29.0'
       VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
 
     steps:
@@ -53,6 +54,11 @@ jobs:
           # Required to run unit tests on linux
           echo "QT_QPA_PLATFORM=offscreen" >> $GITHUB_ENV
 
+      - name: Install CMake and Ninja
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: ${{ env.CMAKE_VERSION }}
+
       - uses: jurplel/install-qt-action@v3
         with:
           version: ${{ env.QT_VERSION }}

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -22,13 +22,14 @@ concurrency:
 
 jobs:
   mac_os_build:
-    runs-on: macos-12
+    runs-on: macos-13
 
     env: # update README for devs if you modify these env. variables
-      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
       TRIPLET: "x64-osx"
       DEPLOYMENT_TARGET: "10.15.0"
-      XC_VERSION: ${{ '14.2' }}
+      XC_VERSION: ${{ '15.2' }}
+      CMAKE_VERSION: '3.29.0'
       QT_ARCH: "desktop"
       VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
 
@@ -40,11 +41,16 @@ jobs:
       - name: Prepare vars
         id: vars
         run: |
-          brew install automake bison flex gnu-sed autoconf-archive libtool gettext cmake ninja
+          brew install automake bison flex gnu-sed autoconf-archive libtool gettext
           echo $(brew --prefix bison)/bin >> $GITHUB_PATH
           echo $(brew --prefix flex)/bin >> $GITHUB_PATH
           echo $(brew --prefix gettext)/bin >> $GITHUB_PATH
 
+      - name: Install CMake and Ninja
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: ${{ env.CMAKE_VERSION }}
+
       - uses: jurplel/install-qt-action@v3
         with:
           version: ${{ env.QT_VERSION }}

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -26,12 +26,13 @@ jobs:
     runs-on: windows-2019
 
     env: # update README for devs if you modify these env. variables
-      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
       TRIPLET: "x64-windows"
       VS_VERSION: "2019"
       CMAKE_GENERATOR: "Visual Studio 16 2019" # see https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md
       CMAKE_ARCH: "x64"
       QT_ARCH: "win64_msvc2019_64"
+      CMAKE_VERSION: '3.29.0'
       VCPKG_ROOT: "C:/vcpkg-root" # Looks like there is more space on C: than on D: drive (~14GB)
 
     steps:
@@ -47,6 +48,11 @@ jobs:
           echo "::set-output name=WORKSPACE_DIR::$WORKSPACE_DIR"
           echo "WORKSPACE_DIR: $WORKSPACE_DIR"
 
+      - name: Install CMake and Ninja
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: ${{ env.CMAKE_VERSION }}
+
       - uses: jurplel/install-qt-action@v3
         with:
           version: ${{ env.QT_VERSION }}

diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ The release is automatically created for each commit on master for each triplet
    
   export PATH=$(brew --prefix flex):$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
   export PATH=`pwd`/../vcpkg:$PATH;\
-  export Qt6_DIR=/opt/Qt/6.6.0/android_arm64_v8a;export QT_HOST_PATH=/opt/Qt/6.6.0/macos;\
+  export Qt6_DIR=/opt/Qt/6.6.3/android_arm64_v8a;export QT_HOST_PATH=/opt/Qt/6.6.3/macos;\
   export ANDROIDAPI=24;\
   export ANDROID_NDK_HOME='/opt/Android/android-sdk/ndk/25.1.8937393';\
   export ANDROID_NDK_ROOT='/opt/Android/android-sdk/ndk/25.1.8937393';\
@@ -126,8 +126,8 @@ Note that this sdk application is dummy on this target and cannot be executed on
   
   export PATH=$(brew --prefix flex):$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
   export PATH=`pwd`/../vcpkg:$PATH;\
-  export Qt6_DIR=/opt/Qt/6.6.0/android_armv7;\
-  export QT_HOST_PATH=/opt/Qt/6.6.0/macos;\
+  export Qt6_DIR=/opt/Qt/6.6.3/android_armv7;\
+  export QT_HOST_PATH=/opt/Qt/6.6.3/macos;\
   export ANDROIDAPI=24;\
   export ANDROID_NDK_HOME='/opt/Android/android-sdk/ndk/25.1.8937393';\
   export ANDROID_NDK_ROOT='/opt/Android/android-sdk/ndk/25.1.8937393';\
@@ -171,8 +171,8 @@ Note that this sdk application is dummy on this target and cannot be executed on
   
   export PATH=$(brew --prefix flex)/bin:$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
   export PATH=${PWD}/../vcpkg:$PATH;\
-  export Qt6_DIR=/opt/Qt/6.6.0/ios;\
-  export QT_HOST_PATH=/opt/Qt/6.6.0/macos;\
+  export Qt6_DIR=/opt/Qt/6.6.3/ios;\
+  export QT_HOST_PATH=/opt/Qt/6.6.3/macos;\
   export DEPLOYMENT_TARGET=14.0;
 
   cmake -B . -S ../../mobile-sdk/ \
@@ -205,7 +205,7 @@ set ROOT_DIR=C:\Users\Peter\repo
 set BUILD_DIR=%ROOT_DIR%\build-sdk\win64
 set SOURCE_DIR=%ROOT_DIR%\mobile-sdk
 set VCPKG_ROOT=%ROOT_DIR%\vcpkg
-set Qt6_DIR=C:\Qt\6.6.0\msvc2019_64
+set Qt6_DIR=C:\Qt\6.6.3\msvc2019_64
 set PATH=%VCPKG_ROOT%;%QT_ROOT%\bin;C:\Program Files\CMake\bin\;%PATH%
 "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -arch=x64
 ```
@@ -237,7 +237,7 @@ cmake --build %BUILD_DIR% --config Release --verbose
   
   export PATH=$(brew --prefix flex)/bin:$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
   export PATH=${PWD}/../vcpkg:$PATH;\
-  export Qt6_DIR=/opt/Qt/6.6.0/macos;\
+  export Qt6_DIR=/opt/Qt/6.6.3/macos;\
   export DEPLOYMENT_TARGET=10.15.0
   
   cmake -B . -S ../../mobile-sdk/ \
@@ -264,7 +264,7 @@ cmake --build %BUILD_DIR% --config Release --verbose
   cd build/x64-linux
   
   export PATH=${PWD}/../vcpkg:$PATH
-  export Qt6_DIR=~/Qt/6.6.0/gcc_64
+  export Qt6_DIR=~/Qt/6.6.3/gcc_64
   
   cmake -B . -S ../../mobile-sdk/ \
     -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake \

diff --git a/vcpkg-overlay/ports/liblzma/portfile.cmake b/vcpkg-overlay/ports/liblzma/portfile.cmake
@@ -1,6 +1,6 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO bminor/xz
+    REPO tukaani-project/xz
     REF "v${VERSION}"
     SHA512 c28461123562564e030f3f733f078bc4c840e87598d9f4b718d4bca639120d8133f969c45d7bdc62f33f081d789ec0f14a1791fb7da18515682bfe3c0c7362e0
     HEAD_REF master

diff --git a/vcpkg-overlay/ports/qt6-poly2tri/portfile.cmake b/vcpkg-overlay/ports/qt6-poly2tri/portfile.cmake
@@ -5,7 +5,7 @@ else()
     vcpkg_download_distfile(ARCHIVE
         URLS "https://download.qt.io/archive/qt/6.6/${VERSION}/submodules/qtpositioning-everywhere-src-${VERSION}.zip"
         FILENAME "qtpositioning-${VERSION}.zip"
-        SHA512 927926c2efbc2f0fa94a4a33174a88c2c121f4e7ffa1f67370a9b88f4d0e1f22932c9c416cacd10562713daba8f1530688b81697bedebae84d727e0657dc052d
+        SHA512 4ad169157f8e8c8f232644b3267b3cee6dc91fd31e4352a16b77292a243bfc1b3be163a456f9d882a6a208fee9ffdcb9b237c29d01cb0e3c49a45cccc6e3a68b 
     )
 
     vcpkg_extract_source_archive(

diff --git a/vcpkg-overlay/ports/qt6-poly2tri/vcpkg.json b/vcpkg-overlay/ports/qt6-poly2tri/vcpkg.json
@@ -1,6 +1,6 @@
 {
     "name": "qt6-poly2tri",
-    "version": "6.6.0",
+    "version": "6.6.3",
     "port-version": 0,
     "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
     "homepage": "https://www.qt.io/",