mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-14 20:34:01 +02:00
Code Issues Projects Releases Wiki Activity

have cmake find OpenSSL (#284)

Browse Source 
* set openssl root dir

apparently a common problem
https://github.com/alexcrichton/ssh2-rs/issues/28

https://stackoverflow.com/questions/29792009/cmake-osx-mac-openssl-brew

related to #263
This commit is contained in:
Andy Alt
2018-10-14 00:18:48 -05:00
committed by GitHub
parent c52279233e
commit d3f7fe78ef
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/glest_game/CMakeLists.txt
View File

@@ -86,7 +86,8 @@ IF(BUILD_ZETAGLEST)
ENDIF() ENDIF()
IF(WANT_USE_OpenSSL) IF(WANT_USE_OpenSSL)
FIND_PACKAGE(OpenSSL) set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
include(FindOpenSSL)
IF(OPENSSL_FOUND) IF(OPENSSL_FOUND)
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
ELSE() ELSE()

22
source/shared_lib/CMakeLists.txt
View File

@@ -81,25 +81,21 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST)
ENDIF() ENDIF()
IF(WANT_USE_OpenSSL) IF(WANT_USE_OpenSSL)
FIND_PACKAGE(OpenSSL) set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
include(FindOpenSSL)
IF(OPENSSL_FOUND) IF(OPENSSL_FOUND)
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENSSL_LIBRARIES})
ELSE() ELSE()
MESSAGE(STATUS "**NOTE: OpenSSL is usually not required.") MESSAGE(STATUS "**NOTE: OpenSSL is usually not required.")
ENDIF() ENDIF()
ENDIF() ENDIF()
include(FindCURL) include(FindCURL)
INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) if(CURL_FOUND)
IF(UNIX) INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
IF(NOT OPENSSL_FOUND) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES})
# default endif()
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES})
ELSE()
# mageia
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
ENDIF()
ENDIF()
FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED) FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED)
INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIR})