kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

move OpenSSL and curl checks from Mod directory to Cloud module

Browse Source
This commit is contained in:
wmayer
2019-10-20 16:08:13 +02:00
parent 9fad0a768f
commit ccb5787ed5
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/CMakeLists.txt
View File

@@ -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)

18
src/Mod/Cloud/CMakeLists.txt
View File

@@ -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)