From 54b3799f895abcfa4b3f5ba71d0ef6f3b1ad639c Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Mon, 2 May 2016 14:03:30 +0200
Subject: [PATCH] [scripts] Move find_package(OpenSSL) to Find.cmake.
---
FileIO/CMakeLists.txt | 7 ++-----
scripts/cmake/Find.cmake | 2 ++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 969ed1ff3ad..71bc8c024f9 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -63,11 +63,8 @@ target_link_libraries(FileIO
)
if(QT4_FOUND)
target_link_libraries(FileIO Qt4::QtXml Qt4::QtXmlPatterns)
- if(WIN32 AND CMAKE_CROSSCOMPILING)
- find_package(OpenSSL)
- if(OPENSSL_FOUND)
- target_link_libraries(FileIO Qt4::QtNetwork ${OPENSSL_LIBRARIES} ws2_32)
- endif()
+ if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND)
+ target_link_libraries(FileIO Qt4::QtNetwork ${OPENSSL_LIBRARIES} ws2_32)
endif()
endif()
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 84d163bdf6d..bcb5afd5af4 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -134,6 +134,8 @@ if(OGS_USE_PETSC)
endif()
+find_package(OpenSSL)
+
## Check MPI package
if(OGS_USE_MPI)
find_package(MPI REQUIRED)
--
GitLab