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 17:58:57 +03:00
commit b1db4e8a7a
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -149,9 +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_IOS_BIN=$QT_BIN_DIR export QT_IOS_BIN=$QT_BIN_DIR
export PATH=$PATH:~/go/bin export PATH=$PATH:~/go/bin
bash deploy/build_ios.sh mkdir build-ios
$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DPREFIX_PATH=$QT_IOS_ROOT_DIR
# ------------------------------------------------------ # ------------------------------------------------------
@ -268,4 +270,4 @@ jobs:
fi fi
export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/${{ matrix.arch }}/bin export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/${{ matrix.arch }}/bin
bash deploy/build_android.sh bash deploy/build_android.sh

7
client/CMakeLists.txt
View file

@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
set(PROJECT AmneziaVPN) set(PROJECT AmneziaVPN)
project(${PROJECT} VERSION 2.0.10) project(${PROJECT} VERSION 2.0.10)
set(BUILD_ID 2) set(BUILD_ID 2)
SET(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.17) if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.17)
@ -17,6 +18,8 @@ set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER "Autogen")
set_property(GLOBAL PROPERTY AUTOMOC_TARGETS_FOLDER "Autogen") set_property(GLOBAL PROPERTY AUTOMOC_TARGETS_FOLDER "Autogen")
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Autogen") set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Autogen")
list(APPEND CMAKE_PREFIX_PATH ${PREFIX_PATH})
find_package(Qt6 REQUIRED COMPONENTS find_package(Qt6 REQUIRED COMPONENTS
Widgets Core Gui Network Xml Widgets Core Gui Network Xml
RemoteObjects Quick Svg QuickControls2 RemoteObjects Quick Svg QuickControls2
@ -279,8 +282,8 @@ if(APPLE)
find_library(FW_APPKIT AppKit) find_library(FW_APPKIT AppKit)
find_library(FW_SECURITY Security) find_library(FW_SECURITY Security)
set(LIBS ${LIBS} FW_COCOA FW_APPLICATIONSERVICES FW_FOUNDATION FW_APPKIT FW_SECURITY FW_CORESERVICES FW_OPENVPN set(LIBS ${LIBS} ${FW_COCOA} ${FW_APPLICATIONSERVICES} ${FW_FOUNDATION} ${FW_APPKIT}
LIB_LIBCRYPTO LIB_SSL) ${FW_SECURITY} ${FW_CORESERVICES} ${LIB_LIBCRYPTO} ${LIB_SSL})
endif() endif()