vladimir.kuznetsov
d04566a6c4
fix for macos build
2022-12-24 18:21:08 +03:00
vladimir.kuznetsov
c8085a368f
added class to open ssh connection using libssh and write data to ssh channel
2022-12-20 13:43:46 +03:00
vladimir.kuznetsov
b0489aa61b
Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support
2022-12-18 09:17:35 +03:00
vladimir.kuznetsov
376bc29e95
set OPENSSL_SSL_LIBRARY for ios
2022-12-17 22:18:14 +03:00
vladimir.kuznetsov
bd22e330a7
set OPENSSL_CRYPTO_LIBRARY for ios
...
- removed linking with brew openssl for ios
2022-12-17 22:02:38 +03:00
vladimir.kuznetsov
9ce7114f8c
added variables for OpenSSL
2022-12-17 21:48:45 +03:00
vladimir.kuznetsov
1303da1c20
openedsl linking method changed
2022-12-17 21:34:59 +03:00
Shahzain Ali
914700712e
OpenSSL finding issue fixed.
2022-12-16 15:27:06 +05:00
Shahzain Ali
73eb9259e2
Update CMakeLists.txt
2022-12-15 14:26:45 +05:00
vladimir.kuznetsov
14c25480ce
changed working directory to call openvpn.sh
2022-12-14 22:26:06 +03:00
vladimir.kuznetsov
77d87f8c50
set working directory to call openvpn.sh
2022-12-14 21:55:51 +03:00
vladimir.kuznetsov
ed2f5af204
Removed "cd client" for ios, also changed CMAKE_SOURCE_DIR to CMAKE_CURRENT_LIST_DIR.
...
Removed duplicate deployment files for macos
2022-12-14 20:58:49 +03:00
vladimir.kuznetsov
5b2f1f8969
processing of 3rdparty libraries moved to a separate cmake file
2022-12-14 20:32:13 +03:00
vladimir.kuznetsov
a2122cb7d7
moved changes from .pro file
2022-12-14 19:55:14 +03:00
vladimir.kuznetsov
d680702b15
change path to cmake folder
2022-12-14 19:17:58 +03:00
vladimir.kuznetsov
d15de499dc
Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into qmake-to-cmake-migration
2022-12-14 19:16:38 +03:00
vladimir.kuznetsov
bd382e3cc7
moved the cmake folder to client root folder
2022-12-14 19:16:12 +03:00
Shahzain Ali
ca9cb997b5
Fixed openVPN issue.
...
Now OpenVPN moved to main target and fixed search path issue, becuase I face below error while archiving. Invalid Bundle. The bundle at 'AmneziaVPN.app/PlugIns/AmneziaVPNNetworkExtension.appex' contains disallowed nested bundles.
2022-12-14 17:28:16 +05:00
Shahzain Ali
ebd920f3b2
Setting target membership on Media.xcassets
2022-12-14 16:56:20 +05:00
vladimir.kuznetsov
a611ddea2d
removed environment OPENSSL_ROOT_DIR variable
2022-12-13 23:52:43 +03:00
vladimir.kuznetsov
75614e0bbb
set environment OPENSSL_ROOT_DIR variable
2022-12-13 23:39:58 +03:00
vladimir.kuznetsov
dafef6463a
added:
...
- set PKG_CONFIG_PATH for openssl
- use find_package for precompiled openssl
removed:
- set CMAKE_PREFIX_PATH for openssl
- renaming ios openssl libs after copying to bin dir
2022-12-13 21:39:02 +03:00
vladimir.kuznetsov
61d502eea4
removed find_package for openssl
2022-12-13 20:49:46 +03:00
vladimir.kuznetsov
71aa525dfd
set CMAKE_PREFIX_PATH for openssl
2022-12-13 20:36:12 +03:00
vladimir.kuznetsov
c0e3875dfd
renaming ios openssl libs after copying to bin dir
2022-12-13 20:23:17 +03:00
vladimir.kuznetsov
7e37b6c151
removed CMAKE_PREFIX_PATH for openssl
2022-12-12 22:22:08 +03:00
vladimir.kuznetsov
0fa84a8b84
set CMAKE_PREFIX_PATH for openssl
2022-12-12 21:39:27 +03:00
vladimir.kuznetsov
236ae57d01
use find_package for precompiled openssl
2022-12-12 20:50:23 +03:00
vladimir.kuznetsov
00ad2e7a80
added path to openssl libs for ios
2022-12-11 18:25:44 +03:00
vladimir.kuznetsov
8f7e5e491f
fixed macos openssl lib types
2022-12-11 17:59:18 +03:00
vladimir.kuznetsov
19101176a7
added link_libraries() for zlib
2022-12-11 17:22:59 +03:00
vladimir.kuznetsov
0bc383fec2
Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support
2022-12-11 17:09:26 +03:00
vladimir.kuznetsov
4df918d6a5
added qtshadertools to actions and cmake
...
- cleaned up CMakeLists in client project
2022-12-11 10:26:31 +03:00
Shahzain Ali
0fa5dc225c
Reverting shadertools in cmake.
2022-12-11 04:19:24 +05:00
Shahzain Ali
b14f14c45a
Update CMakeLists.txt
2022-12-11 04:09:45 +05:00
Shahzain Ali
0851f4fdd4
Added Qt6ShaderTools in cmake
2022-12-11 04:01:15 +05:00
Shahzain Ali
a0f114e15c
Fixing openvpn
2022-12-11 03:22:59 +05:00
vladimir.kuznetsov
1401fcd97d
disabled some libssh options
2022-12-10 20:15:05 +03:00
vladimir.kuznetsov
efcd291e65
Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support
2022-12-10 19:07:00 +03:00
vladimir.kuznetsov
f98792714e
set working directory to call openvpn.sh
2022-12-10 18:46:17 +03:00
vladimir.kuznetsov
cfaba932e0
changeGed libz lib name for linux target
2022-12-10 18:00:50 +03:00
vladimir.kuznetsov
b1db4e8a7a
Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support
2022-12-10 17:58:57 +03:00
vladimir.kuznetsov
4d621dcbfe
set CMAKE_PREFIX_PATH in CMakeLists file
2022-12-09 17:44:57 +03:00
vladimir.kuznetsov
2d3ac286ac
skip section with openssl copy for linux
2022-12-09 16:18:02 +03:00
vladimir.kuznetsov
4e96b5d4a6
added libz lib name for linux target
2022-12-09 15:57:31 +03:00
Shahzain Ali
ea2637b1b4
Setting QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON
2022-12-09 04:13:14 +05:00
Shahzain Ali
d784e26913
MacOS issue fixed.
2022-12-09 02:33:46 +05:00
vladimir.kuznetsov
cb69298385
Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support
2022-12-08 21:41:33 +03:00
vladimir.kuznetsov
a8fc42a17e
added copying OpenSSL libraries, for windows and macos, to the folder with binaries, because we have the wrong folder structure with the OpenSSL library
2022-12-08 21:40:51 +03:00
Shahzain Ali
005008814a
icon added in cmake.
2022-12-08 21:34:55 +05:00
