kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Upgrade OpenSSL to 3.2.1.

Browse source
This commit is contained in:
John Preston 2024-03-25 13:24:50 +04:00
parent 95c83fd264
commit 161b986c32
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
external/openssl/CMakeLists.txt vendored
View file

@ -9,13 +9,13 @@ add_library(desktop-app::external_openssl ALIAS external_openssl)
if (WIN32) if (WIN32)
set(openssl_lib_ext lib) set(openssl_lib_ext lib)
set(openssl_lib_loc ${libs_loc}/openssl/out) set(openssl_lib_loc ${libs_loc}/openssl3/out)
else() else()
set(openssl_lib_ext a) set(openssl_lib_ext a)
if (APPLE) if (APPLE)
set(openssl_lib_loc ${libs_loc}/openssl) set(openssl_lib_loc ${libs_loc}/openssl3)
else() else()
set(openssl_lib_loc /usr/local/desktop-app/openssl-1.1.1/lib) set(openssl_lib_loc /usr/local/desktop-app/openssl-3.2.1/lib64)
endif() endif()
endif() endif()

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

@ -11,12 +11,18 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
if (LINUX) if (LINUX)
target_include_directories(external_openssl_common SYSTEM target_include_directories(external_openssl_common SYSTEM
INTERFACE INTERFACE
/usr/local/desktop-app/openssl-1.1.1/include /usr/local/desktop-app/openssl-3.2.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}/openssl3/include
) )
endif() endif()
# OpenSSL 3 deprecated AES_set_encrypt_key/decrypt_key/ige_encrypt/cbc_encrypt
target_compile_options_if_exists(external_openssl_common
INTERFACE
-Wno-deprecated-declarations
)
endif() endif()

1
options_win.cmake
View file

@ -145,6 +145,7 @@ INTERFACE
Wtsapi32 Wtsapi32
Crypt32 Crypt32
Propsys Propsys
Bcrypt
) )
if (build_winstore) if (build_winstore)