AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
vladimir.kuznetsov 2022-12-10 19:07:00 +03:00
commit efcd291e65
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/deploy.yml vendored
View file

@ -149,11 +149,11 @@ jobs:
- name: 'Build project' - name: 'Build project'
run: | run: |
export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin" 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 QT_IOS_BIN=$QT_BIN_DIR
export PATH=$PATH:~/go/bin export PATH=$PATH:~/go/bin
mkdir build-ios 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
# ------------------------------------------------------ # ------------------------------------------------------

3
client/CMakeLists.txt
View file

@ -27,7 +27,8 @@ find_package(Qt6 REQUIRED COMPONENTS
) )
if(IOS) 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() endif()
set(IS_CI ${CI}) set(IS_CI ${CI})