diff --git a/cmake/macros/InstallBesideConsole.cmake b/cmake/macros/InstallBesideConsole.cmake index 4c6087b877..ab3fa5dee4 100644 --- a/cmake/macros/InstallBesideConsole.cmake +++ b/cmake/macros/InstallBesideConsole.cmake @@ -65,10 +65,4 @@ macro(install_beside_console) endif() endif () - - # set variables used by manual ssleay library copy - set(TARGET_INSTALL_DIR ${COMPONENT_INSTALL_DIR}) - set(TARGET_INSTALL_COMPONENT ${SERVER_COMPONENT}) - manually_install_ssl_eay() - endmacro() diff --git a/cmake/macros/ManuallyInstallSSLEay.cmake b/cmake/macros/ManuallyInstallSSLEay.cmake deleted file mode 100644 index 41e7e9eaf3..0000000000 --- a/cmake/macros/ManuallyInstallSSLEay.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# -# ManuallyInstallSSLEay.cmake -# -# Created by Stephen Birarda on 1/15/16. -# Copyright 2014 High Fidelity, Inc. -# -# 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_ssl_eay) - - # on windows we have had issues with targets missing ssleay library - # not convinced we actually need it (I assume it would show up in the dependency tree) - # but to be safe we install it manually beside the current target - if (WIN32) - # we need to find SSL_EAY_LIBRARY_* so we can install it beside this target - # so we have to call find_package(OpenSSL) here even though this target may not specifically need it - find_package(OpenSSL REQUIRED) - - install( - FILES "${OPENSSL_DLL_PATH}/ssleay32.dll" - DESTINATION ${TARGET_INSTALL_DIR} - COMPONENT ${TARGET_INSTALL_COMPONENT} - ) - endif() - -endmacro() diff --git a/cmake/modules/FindOpenSSL.cmake b/cmake/modules/FindOpenSSL.cmake index 5cc48d2598..b91f33b753 100644 --- a/cmake/modules/FindOpenSSL.cmake +++ b/cmake/modules/FindOpenSSL.cmake @@ -81,20 +81,20 @@ if (WIN32 AND NOT CYGWIN) # We are using the libraries located in the VC subdir instead of the parent directory eventhough : # libeay32MD.lib is identical to ../libeay32.lib, and # ssleay32MD.lib is identical to ../ssleay32.lib - find_library(LIB_EAY_DEBUG NAMES libeay32MDd libeay32d - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" "VC" "lib/VC" + find_library(LIB_EAY_DEBUG NAMES libeay32MTd + ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static" ) - find_library(LIB_EAY_RELEASE NAMES libeay32MD libeay32 - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" "VC" "lib/VC" + find_library(LIB_EAY_RELEASE NAMES libeay32MT + ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static" ) - find_library(SSL_EAY_DEBUG NAMES ssleay32MDd ssleay32d - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" "VC" "lib/VC" + find_library(SSL_EAY_DEBUG NAMES ssleay32MTd + ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static" ) - find_library(SSL_EAY_RELEASE NAMES ssleay32MD ssleay32 ssl - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" "VC" "lib/VC" + find_library(SSL_EAY_RELEASE NAMES ssleay32MT + ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static" ) set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}") @@ -107,39 +107,6 @@ if (WIN32 AND NOT CYGWIN) select_library_configurations(SSL_EAY) set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY}) - - find_path(OPENSSL_DLL_PATH NAMES ssleay32.dll PATH_SUFFIXES "bin" ${_OPENSSL_ROOT_HINTS_AND_PATHS}) - - elseif (MINGW) - # same player, for MinGW - set(LIB_EAY_NAMES libeay32) - set(SSL_EAY_NAMES ssleay32) - - if (CMAKE_CROSSCOMPILING) - list(APPEND LIB_EAY_NAMES crypto) - list(APPEND SSL_EAY_NAMES ssl) - endif () - - find_library(LIB_EAY NAMES ${LIB_EAY_NAMES} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" "lib/MinGW" - ) - - find_library(SSL_EAY NAMES ${SSL_EAY_NAMES} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" "lib/MinGW" - ) - - mark_as_advanced(SSL_EAY LIB_EAY) - set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY}) - unset(LIB_EAY_NAMES) - unset(SSL_EAY_NAMES) - else () - # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues: - find_library(LIB_EAY NAMES libeay32 HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_LIBDIR} PATH_SUFFIXES lib) - - find_library(SSL_EAY NAMES ssleay32 HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_LIBDIR} PATH_SUFFIXES lib) - - mark_as_advanced(SSL_EAY LIB_EAY) - set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY}) endif() else() @@ -231,9 +198,6 @@ endif () include(FindPackageHandleStandardArgs) set(OPENSSL_REQUIREMENTS OPENSSL_LIBRARIES OPENSSL_INCLUDE_DIR) -if (WIN32) - list(APPEND OPENSSL_REQUIREMENTS OPENSSL_DLL_PATH) -endif () if (OPENSSL_VERSION) find_package_handle_standard_args(OpenSSL @@ -250,8 +214,4 @@ else () ) endif () -if (WIN32) - add_paths_to_fixup_libs(${OPENSSL_DLL_PATH}) -endif () - mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_SEARCH_DIRS) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index b398778db7..35fbec76c8 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -266,9 +266,5 @@ add_bugsplat() if (WIN32) 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_ssl_eay() - package_libraries_for_deployment() endif()