kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

OS X 10.10-10.11: Use OpenSSL 1.1.1, enable WebRTC.

Browse source
This commit is contained in:
John Preston 2020-08-20 17:59:10 +04:00
parent 4c8956027d
commit 9b1ed3965b
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
external/openssl/CMakeLists.txt vendored
View file

@ -13,11 +13,7 @@ if (WIN32)
else() else()
set(openssl_lib_ext a) set(openssl_lib_ext a)
if (APPLE) if (APPLE)
if (NOT build_osx) set(openssl_lib_loc ${libs_loc}/openssl_1_1_1)
set(openssl_lib_loc ${libs_loc}/openssl_1_1_1)
else()
set(openssl_lib_loc ${libs_loc}/openssl)
endif()
else() else()
set(openssl_lib_loc /usr/local/desktop-app/openssl-1.1.1/lib) set(openssl_lib_loc /usr/local/desktop-app/openssl-1.1.1/lib)
endif() endif()

7
external/openssl/openssl_common/CMakeLists.txt vendored
View file

@ -13,15 +13,10 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
INTERFACE INTERFACE
/usr/local/desktop-app/openssl-1.1.1/include /usr/local/desktop-app/openssl-1.1.1/include
) )
elseif (NOT APPLE OR NOT build_osx)
target_include_directories(external_openssl_common SYSTEM
INTERFACE
${libs_loc}/openssl_1_1_1/include
)
else() else()
target_include_directories(external_openssl_common SYSTEM target_include_directories(external_openssl_common SYSTEM
INTERFACE INTERFACE
${libs_loc}/openssl/include ${libs_loc}/openssl_1_1_1/include
) )
endif() endif()

2
variables.cmake
View file

@ -27,7 +27,7 @@ if (DESKTOP_APP_SPECIAL_TARGET STREQUAL ""
endif() endif()
set(webrtc_not_supported 0) set(webrtc_not_supported 0)
if (osx_special_target OR (LINUX AND CMAKE_SIZEOF_VOID_P EQUAL 4)) if (LINUX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
set(webrtc_not_supported 1) set(webrtc_not_supported 1)
endif() endif()