From 5649f85b580dc73540115504206914eac1e49532 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sat, 10 Dec 2022 18:09:41 +0300 Subject: [PATCH 1/2] set QT_HOST_PATH for ios target --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 909bacbe..16261332 100644 --- a/.github/workflows/deploy.yml +++ b/.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 # ------------------------------------------------------ From f98792714e20c199faef64c6fc74b6f8d2a30e47 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sat, 10 Dec 2022 18:46:17 +0300 Subject: [PATCH 2/2] set working directory to call openvpn.sh --- client/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index ea7a0838..81a66ae2 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -28,7 +28,8 @@ find_package(Qt6 REQUIRED COMPONENTS qt_standard_project_setup() 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()