CMake: regroup some lines for better understanding and fix MacOS pack…

…aging

.github/workflows/build.yml

@@ -265,13 +265,13 @@ jobs:
         id: set_vars
         run: |
           ./scripts/ci-set-vars.sh
-          echo QTVER=5 >> "$GITHUB_OUTPUT"
+          echo QTVER=6 >> "$GITHUB_OUTPUT"
         env:
           REPOSITORY: ${{ github.event.repository.name }}
       - name: ccache
         uses: hendrikmuhs/[email protected]
         with:
-          key: ccache-osx_qt${{ steps.set_vars.outputs.QTVER }}
+          key: ccache-osx_qt${{ steps.set_vars.outputs.QTVER }}-r1
           max-size: 256M
       - name: "Install dependencies"
         # Sometimes, brew thinks it needs to install from source rather than binary.

autogen.sh

@@ -40,6 +40,7 @@ case "$OSTYPE" in
     darwin*)
         if test v$QTVER = v6; then
             EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DQt6_DIR=$(brew --prefix qt6)/lib/cmake/Qt6"
+            #EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DQt6_DIR=$HOME/Qt/6.5.3/macos/lib/cmake/Qt6"
         else
             EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5"
         fi

cmake/ContourThirdParties.cmake

@@ -140,9 +140,9 @@ macro(ContourThirdPartiesSummary2)
     message(STATUS "freetype            ${THIRDPARTY_BUILTIN_freetype}")
     message(STATUS "harfbuzz            ${THIRDPARTY_BUILTIN_harfbuzz}")
     message(STATUS "range-v3            ${THIRDPARTY_BUILTIN_range_v3}")
+    message(STATUS "yaml-cpp            ${THIRDPARTY_BUILTIN_yaml_cpp}")
     message(STATUS "termbench-pro       ${THIRDPARTY_BUILTIN_termbench}")
     message(STATUS "libunicode          ${THIRDPARTY_BUILTIN_unicode_core}")
-    message(STATUS "yaml-cpp            ${THIRDPARTY_BUILTIN_yaml_cpp}")
     message(STATUS "boxed-cpp           ${THIRDPARTY_BUILTIN_boxed_cpp}")
     message(STATUS "------------------------------------------------------------------------------")
 endmacro()

scripts/install-deps.sh

@@ -497,9 +497,6 @@ install_deps_fedora()
 
 install_deps_darwin()
 {
-    # NB: yaml-cpp is available on brew, but gives linker error on Github CI.
-    fetch_and_unpack_yaml_cpp
-
     fetch_and_unpack_libunicode
 
     [ x$PREPARE_ONLY_EMBEDS = xON ] && return
@@ -515,7 +512,8 @@ install_deps_darwin()
         pkg-config \
         qt$QTVER \
         libssh2 \
-        range-v3
+        range-v3 \
+        yaml-cpp
 }
 
 main()