Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support

.github/workflows/deploy.yml

@@ -149,11 +149,11 @@ jobs:
     - name: 'Build project'
       run: |
         export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin"
-        export QT_IOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios"
+        export QT_MACOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos"
         export QT_IOS_BIN=$QT_BIN_DIR
         export PATH=$PATH:~/go/bin
         mkdir build-ios
-        $QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DPREFIX_PATH=$QT_IOS_ROOT_DIR
+        $QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR
 
 # ------------------------------------------------------
 

client/CMakeLists.txt

@@ -27,7 +27,8 @@ find_package(Qt6 REQUIRED COMPONENTS
 )
 
 if(IOS)
-    execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/scripts/openvpn.sh)
+    execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/scripts/openvpn.sh args
+        WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/client)
 endif()
 
 set(IS_CI ${CI})