[publish] Add qtpaths.bat workaround

Stellarium · Oct 10, 2023 · f9ba0a8 · f9ba0a8
1 parent f80468d
commit f9ba0a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -36,10 +36,10 @@ environment:
     msvcname: Visual Studio 15 2017
     cmake_args:
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    qtver: 6.5
+    qtver: 6.5.2
     qtbin: msvc2019_arm64
     msvcname: Visual Studio 17 2022
-    cmake_args: -A ARM64 -DSTELLARIUM_BUILD_ARM64=ON -DQT_HOST_PATH=C:/Qt/6.5/msvc2019_64 -DENABLE_QTWEBENGINE=OFF
+    cmake_args: -A ARM64 -DSTELLARIUM_BUILD_ARM64=ON -DQT_HOST_PATH=C:/Qt/6.5.2/msvc2019_64 -DENABLE_QTWEBENGINE=OFF -DENABLE_NLS=OFF -DQT_PATHS=%APPVEYOR_BUILD_FOLDER%/util/qtpaths_workaround.bat
 
 before_build:
   - ps: if($env:qtbin.contains('_64')) { $env:BITS=64 } else { $env:BITS=32 }

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -611,9 +611,10 @@ IF(WIN32)
           SET(VIRTUAL_KBD_SETTING "--no-virtualkeyboard")
      ENDIF()
 
-     IF(STELLARIUM_BUILD_ARM64)
-          cmake_path(APPEND QT_PATHS ${QT6_INSTALL_PREFIX} "bin" "qtpaths.bat")
-     ENDIF()
+     # Use external workaround until https://github.com/appveyor/ci/issues/3892 is addressed
+     # IF(STELLARIUM_BUILD_ARM64)
+     #      cmake_path(APPEND QT_PATHS ${QT6_INSTALL_PREFIX} "bin" "qtpaths.bat")
+     # ENDIF()
      IF(QT_PATHS)
           SET(_qt_paths "--qtpaths \"${QT_PATHS}\"")
      ELSE()

diff --git a/util/qtpaths_workaround.bat b/util/qtpaths_workaround.bat
@@ -0,0 +1,2 @@
+@echo off
+C:\Qt\6.5.2\msvc2019_64\bin\qtpaths6.exe -qtconf "C:\Qt\6.5.2\msvc2019_arm64\bin\target_qt.conf" %*