set environment OPENSSL_ROOT_DIR variable
This commit is contained in:
parent
dafef6463a
commit
75614e0bbb
2 changed files with 13 additions and 6 deletions
2
.github/workflows/deploy.yml
vendored
2
.github/workflows/deploy.yml
vendored
|
|
@ -155,7 +155,7 @@ jobs:
|
||||||
cd client
|
cd client
|
||||||
mkdir build-ios
|
mkdir build-ios
|
||||||
$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR
|
$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR
|
||||||
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
|
|
||||||
Build-MacOS:
|
Build-MacOS:
|
||||||
|
|
|
||||||
|
|
@ -88,12 +88,19 @@ if(NOT LINUX)
|
||||||
set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/ios/iphone/libcrypto.a")
|
set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/ios/iphone/libcrypto.a")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
|
if(NOT IOS)
|
||||||
DESTINATION ${OPENSSL_LIBRARIES_DIR})
|
file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
|
||||||
file(COPY "${OPENSSL_PATH}/include"
|
DESTINATION ${OPENSSL_LIBRARIES_DIR})
|
||||||
DESTINATION ${OPENSSL_ROOT_DIR})
|
file(COPY "${OPENSSL_PATH}/include"
|
||||||
|
DESTINATION ${OPENSSL_ROOT_DIR})
|
||||||
|
else()
|
||||||
|
file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
|
||||||
|
DESTINATION ${OPENSSL_LIBRARIES_DIR}/ios)
|
||||||
|
file(COPY "${OPENSSL_PATH}/include"
|
||||||
|
DESTINATION ${OPENSSL_ROOT_DIR}/ios)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(ENV{PKG_CONFIG_PATH} "${OPENSSL_ROOT_DIR}")
|
set(ENV{OPENSSL_ROOT_DIR} "${OPENSSL_ROOT_DIR}")
|
||||||
find_package(OpenSSL REQUIRED)
|
find_package(OpenSSL REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue