Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use installed OpenSSL not Qt version (OpenSSL v3) #471

Merged
merged 1 commit into from
Feb 9, 2024
Merged

Use installed OpenSSL not Qt version (OpenSSL v3) #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions avogadro/lastinstall/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,10 @@ if((APPLE OR WIN32) AND NOT ${CMAKE_VERSION} VERSION_LESS 2.8.8)

# grab OpenSSL for Windows
if(WIN32)
if(EXISTS "${Qt5_Dir}/../../Tools/OpenSSLv3/Win_x64/")
set(OPENSSL_ROOT_DIR "${Qt5_Dir}/../../Tools/OpenSSLv3/Win_x64/")
find_package(OpenSSL REQUIRED)
if (DEFINED OPENSSL_FOUND)
set(OPENSSL_ROOT_DIR "${OPENSSL_INCLUDE_DIR}/.." CACHE PATH "OpenSSL root directory")
message(STATUS "Using OpenSSL from ${OPENSSL_ROOT_DIR}")
elseif(DEFINED $ENV{OPENSSL_ROOT_DIR})
set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
message(STATUS "Using OpenSSL from ${OPENSSL_ROOT_DIR}")
endif()
if (DEFINED OPENSSL_ROOT_DIR)
file(GLOB OPENSSL_DLL ${OPENSSL_ROOT_DIR}/bin/*.dll)
install(FILES ${OPENSSL_DLL} DESTINATION ${INSTALL_RUNTIME_DIR})
endif()
Expand Down
13 changes: 3 additions & 10 deletions cmake/AvogadroCPack.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,9 @@ if(INSTALL_BUNDLE_FILES)

# grab OpenSSL for Windows
if(WIN32)
if(EXISTS "${Qt5_Dir}/../../Tools/OpenSSLv3/Win_x64/")
set(OPENSSL_ROOT_DIR "${Qt5_Dir}/../../Tools/OpenSSLv3/Win_x64/")
elseif(DEFINED $ENV{OPENSSL_ROOT_DIR})
set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
elseif(EXISTS "D:/a/avogadroapp/Qt/Tools/OpenSSLv3/Win_x64/")
set(OPENSSL_ROOT_DIR "D:/a/avogadroapp/Qt/Tools/OpenSSLv3/Win_x64")
elseif(EXISTS "D:/a/avogadrolibs/Qt/Tools/OpenSSLv3/Win_x64/")
set(OPENSSL_ROOT_DIR "D:/a/avogadrolibs/Qt/Tools/OpenSSLv3/Win_x64")
endif()
if (DEFINED OPENSSL_ROOT_DIR)
find_package(OpenSSL REQUIRED)
if (DEFINED OPENSSL_FOUND)
set(OPENSSL_ROOT_DIR "${OPENSSL_INCLUDE_DIR}/.." CACHE PATH "OpenSSL root directory")
message(STATUS "Using OpenSSL from ${OPENSSL_ROOT_DIR}")
file(GLOB OPENSSL_DLL ${OPENSSL_ROOT_DIR}/bin/*.dll)
install(FILES ${OPENSSL_DLL} DESTINATION ${INSTALL_RUNTIME_DIR})
Expand Down
Loading