From ccb5787ed53dbb30b67c6d4cd8153a2a5a31111f Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 20 Oct 2019 16:08:13 +0200 Subject: [PATCH] move OpenSSL and curl checks from Mod directory to Cloud module --- src/Mod/CMakeLists.txt | 18 ------------------ src/Mod/Cloud/CMakeLists.txt | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Mod/CMakeLists.txt b/src/Mod/CMakeLists.txt index 6975c47d53..c5265e2175 100644 --- a/src/Mod/CMakeLists.txt +++ b/src/Mod/CMakeLists.txt @@ -103,24 +103,6 @@ if(BUILD_FEM) endif(BUILD_FEM) if(BUILD_CLOUD) -#------------------------------ OpenSSL and CURL ------------------------- - IF (APPLE) - set(OPENSSL_ROOT_DIR ${HOMEBREW_PREFIX}/Cellar/openssl/*) - ENDIF(APPLE) - IF (UNIX) - find_package(PkgConfig REQUIRED) - pkg_search_module(OPENSSL REQUIRED openssl) - ELSE() - find_package(OPENSSL REQUIRED) - ENDIF(UNIX) - IF(OPENSSL_FOUND) - message(STATUS "openssl-${OPENSSL_VERSION} has been found\n") - ENDIF(OPENSSL_FOUND) - find_package(CURL REQUIRED) - IF(CURL_FOUND) - message(STATUS "CURL has been found\n") - ENDIF(CURL_FOUND) -# ------------------------------------------------------------------------ add_subdirectory(Cloud) endif(BUILD_CLOUD) diff --git a/src/Mod/Cloud/CMakeLists.txt b/src/Mod/Cloud/CMakeLists.txt index 95457658e5..fafae67920 100644 --- a/src/Mod/Cloud/CMakeLists.txt +++ b/src/Mod/Cloud/CMakeLists.txt @@ -1,3 +1,21 @@ +#------------------------------ OpenSSL and CURL ------------------------- +if (APPLE) + set(OPENSSL_ROOT_DIR ${HOMEBREW_PREFIX}/Cellar/openssl/*) +endif(APPLE) +if (UNIX) + find_package(PkgConfig REQUIRED) + pkg_search_module(OPENSSL REQUIRED openssl) +else() + find_package(OPENSSL REQUIRED) +endif(UNIX) +if(OPENSSL_FOUND) + message(STATUS "openssl-${OPENSSL_VERSION} has been found\n") +endif(OPENSSL_FOUND) + find_package(CURL REQUIRED) +if(CURL_FOUND) + message(STATUS "CURL has been found\n") +endif(CURL_FOUND) +# ------------------------------------------------------------------------ add_subdirectory(App) if(BUILD_GUI)