Commit graph

747 commits

Author SHA1 Message Date
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
d3cbd8cdae Update deploy.yml 2022-12-11 04:21:28 +05: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
807b3370e7 Adding qtshadertools module in qt installation 2022-12-11 03:42:46 +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
5649f85b58 set QT_HOST_PATH for ios target 2022-12-10 18:09:41 +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
ab9c11e038 set ios root dir as CMAKE_PREFIX_PATH 2022-12-09 18:12:39 +03:00
vladimir.kuznetsov
4d621dcbfe set CMAKE_PREFIX_PATH in CMakeLists file 2022-12-09 17:44:57 +03:00
vladimir.kuznetsov
a45537cbf3 added DCMAKE_PREFIX_PATH to IOS target 2022-12-09 17:30:46 +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
9294324732
fixing host path 2022-12-09 04:24:16 +05:00
Shahzain Ali
b92422594b Merge branch 'qmake-to-cmake-migration' of https://github.com/amnezia-vpn/desktop-client into qmake-to-cmake-migration 2022-12-09 04:13:37 +05:00
Shahzain Ali
ea2637b1b4 Setting QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON 2022-12-09 04:13:14 +05:00
Shahzain Ali
c97b4859c1
Update deploy.yml 2022-12-09 04:05:25 +05:00
Shahzain Ali
7a2f42de30
Update deploy.yml 2022-12-09 03:58:36 +05:00
Shahzain Ali
99f5f78fc7
Update deploy.yml 2022-12-09 03:48:12 +05:00
Shahzain Ali
668f0ca675
Update deploy.yml 2022-12-09 03:47:09 +05:00
Shahzain Ali
6a89a51ea6
added QT_TOOL_CHAIN for ios cmake 2022-12-09 03:38:29 +05:00
Shahzain Ali
df6b0f3945
Update deploy.yml 2022-12-09 03:11:31 +05:00
Shahzain Ali
65cf243373
Update deploy.yml 2022-12-09 03:10:26 +05:00
Shahzain Ali
2ef7813219
Update deploy.yml 2022-12-09 03:06:16 +05:00
Shahzain Ali
216efd74bf
Update deploy.yml 2022-12-09 03:04:43 +05:00
Shahzain Ali
b9d027a44a
Update deploy.yml 2022-12-09 03:03:17 +05:00
Shahzain Ali
9097dd9645
actions for ios using cmake 2022-12-09 02:59:35 +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
Shahzain Ali
ad3bbaedb3 getting openvpn.sh script message. 2022-12-08 18:22:07 +05:00
Shahzain Ali
48fa3c8aec Update CMakeLists.txt 2022-12-07 20:36:22 +05:00
Shahzain Ali
fb585cbac0 OpenVPN integrated successfully 2022-12-07 20:35:43 +05:00
Shahzain Ali
dd1adda1a6 postbuild command fix. 2022-12-07 00:19:02 +05:00
vladimir.kuznetsov
3742583508 added zlib to submodules. Added build and link zlib, libssh in CMakeLists.txt 2022-12-06 18:17:10 +03:00
Shahzain Ali
3c6cd623af version issues fixed 2022-12-06 19:18:38 +05:00