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
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
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
Shahzain Ali
70c6e69b36
updatinf info.plist for .vpn type.
2022-12-06 03:09:45 +05:00
Shahzain Ali
5237058016
Added launcher
2022-12-06 02:18:45 +05:00
Shahzain Ali
b87c5f8a51
iOS building successfully
...
Need to remove postbuild commands most probably from osxtools.cmake
2022-12-06 00:42:48 +05:00
Shahzain Ali
43e7a03af4
Some fixes.
...
Now team is preselected in signing.
2022-12-05 20:47:12 +05:00
vladimir.kuznetsov
0ec0cb1b19
feature: added libssh submodule
2022-12-04 01:43:34 +03:00
Shahzain Ali
c8dd12eb20
Some more progress in cmake
...
Still have errors, currently not using apple-compile.sh building completely using cmake.
2022-12-02 22:26:10 +05:00
Shahzain Ali
008592f13b
Architecture change not needed for ios build
...
CMAKE_OSX_ARCHITECTURES not needed for ios, it is setting x86_64 for all targets in ios.
2022-12-02 15:07:05 +05:00
vladimir.kuznetsov
56b9972053
build script for macos now uses cmake
2022-12-01 20:26:00 +03:00
