mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-13 22:27:13 +02:00
Revert "Remove VCPKG OpenSSL hack."
This reverts commit 891c6babc8477f1a5a08c5a202f847252b4af7e7.
This commit is contained in:
parent
5a93ba1d06
commit
0b989abf80
3 changed files with 42 additions and 0 deletions
|
@ -72,5 +72,11 @@ macro(install_beside_console)
|
|||
COMPONENT ${SERVER_COMPONENT}
|
||||
)
|
||||
endif()
|
||||
|
||||
# set variables used by manual ssleay library copy
|
||||
set(TARGET_INSTALL_DIR ${COMPONENT_INSTALL_DIR})
|
||||
set(TARGET_INSTALL_COMPONENT ${SERVER_COMPONENT})
|
||||
manually_install_openssl_for_qt()
|
||||
|
||||
endif ()
|
||||
endmacro()
|
||||
|
|
35
cmake/macros/ManuallyInstallOpenSSLForQt.cmake
Normal file
35
cmake/macros/ManuallyInstallOpenSSLForQt.cmake
Normal file
|
@ -0,0 +1,35 @@
|
|||
#
|
||||
# ManuallyInstallOpenSSLforQt.cmake
|
||||
#
|
||||
# Created by Stephen Birarda on 1/15/16.
|
||||
# Copyright 2014 High Fidelity, Inc.
|
||||
# Copyright 2020 Vircadia contributors.
|
||||
#
|
||||
# Distributed under the Apache License, Version 2.0.
|
||||
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
#
|
||||
|
||||
macro(manually_install_openssl_for_qt)
|
||||
|
||||
# Qt dynamically links OpenSSL if it can find it on the user's machine
|
||||
# We want to avoid it being found somewhere random and have it not being a compatible version
|
||||
# So even though we don't need the dynamic version of OpenSSL for our direct-use purposes
|
||||
# we use this macro to include the two SSL DLLs with the targets using QtNetwork
|
||||
if (WIN32)
|
||||
# we have to call find_package(OpenSSL) here even though this target may not directly need it
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
install(
|
||||
FILES "${VCPKG_INSTALL_ROOT}/bin/libcrypto-3-x64.dll"
|
||||
DESTINATION ${TARGET_INSTALL_DIR}
|
||||
COMPONENT ${TARGET_INSTALL_COMPONENT}
|
||||
)
|
||||
|
||||
install(
|
||||
FILES "${VCPKG_INSTALL_ROOT}/bin/libssl-3-x64.dll"
|
||||
DESTINATION ${TARGET_INSTALL_DIR}
|
||||
COMPONENT ${TARGET_INSTALL_COMPONENT}
|
||||
)
|
||||
endif()
|
||||
|
||||
endmacro()
|
|
@ -451,6 +451,7 @@ set(EXTRA_DEPLOY_OPTIONS "--qmldir \"${PROJECT_SOURCE_DIR}/resources/qml\"")
|
|||
|
||||
set(TARGET_INSTALL_DIR ${INTERFACE_INSTALL_DIR})
|
||||
set(TARGET_INSTALL_COMPONENT ${CLIENT_COMPONENT})
|
||||
manually_install_openssl_for_qt()
|
||||
package_libraries_for_deployment()
|
||||
|
||||
find_package(GifCreator REQUIRED)
|
||||
|
|
Loading…
Reference in a new issue