kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'findopenssl-path-fix'

Browse Source 
ca5c522 Add missing PATHS to find_path commands to fix openssl searching
This commit is contained in:
Brad King 2010-08-03 16:08:39 -04:00 committed by CMake Topic Stage
commit 70a8e10495
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/FindOpenSSL.cmake
View File

@ -40,7 +40,7 @@ MARK_AS_ADVANCED(OPENSSL_ROOT_DIR)
# Re-use the previous path: # Re-use the previous path:
FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
${OPENSSL_ROOT_DIR}/include PATHS ${OPENSSL_ROOT_DIR}/include
) )
IF(WIN32 AND NOT CYGWIN) IF(WIN32 AND NOT CYGWIN)
@ -61,16 +61,16 @@ IF(WIN32 AND NOT CYGWIN)
# libeay32MD.lib is identical to ../libeay32.lib, and # libeay32MD.lib is identical to ../libeay32.lib, and
# ssleay32MD.lib is identical to ../ssleay32.lib # ssleay32MD.lib is identical to ../ssleay32.lib
FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd libeay32 FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd libeay32
${OPENSSL_ROOT_DIR}/lib/VC PATHS ${OPENSSL_ROOT_DIR}/lib/VC
) )
FIND_LIBRARY(LIB_EAY_RELEASE NAMES libeay32MD libeay32 FIND_LIBRARY(LIB_EAY_RELEASE NAMES libeay32MD libeay32
${OPENSSL_ROOT_DIR}/lib/VC PATHS ${OPENSSL_ROOT_DIR}/lib/VC
) )
FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssleay32 ssl FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssleay32 ssl
${OPENSSL_ROOT_DIR}/lib/VC PATHS ${OPENSSL_ROOT_DIR}/lib/VC
) )
FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssleay32 ssl FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssleay32 ssl
${OPENSSL_ROOT_DIR}/lib/VC PATHS ${OPENSSL_ROOT_DIR}/lib/VC
) )
if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE ) if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
set( OPENSSL_LIBRARIES set( OPENSSL_LIBRARIES
@ -85,20 +85,20 @@ IF(WIN32 AND NOT CYGWIN)
ELSEIF(MINGW) ELSEIF(MINGW)
# same player, for MingW # same player, for MingW
FIND_LIBRARY(LIB_EAY NAMES libeay32 FIND_LIBRARY(LIB_EAY NAMES libeay32
${OPENSSL_ROOT_DIR}/lib/MinGW PATHS ${OPENSSL_ROOT_DIR}/lib/MinGW
) )
FIND_LIBRARY(SSL_EAY NAMES ssleay32 FIND_LIBRARY(SSL_EAY NAMES ssleay32
${OPENSSL_ROOT_DIR}/lib/MinGW PATHS ${OPENSSL_ROOT_DIR}/lib/MinGW
) )
MARK_AS_ADVANCED(SSL_EAY LIB_EAY) MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
ELSE(MSVC) ELSE(MSVC)
# Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues: # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
FIND_LIBRARY(LIB_EAY NAMES libeay32 FIND_LIBRARY(LIB_EAY NAMES libeay32
${OPENSSL_ROOT_DIR}/lib PATHS ${OPENSSL_ROOT_DIR}/lib
) )
FIND_LIBRARY(SSL_EAY NAMES ssleay32 FIND_LIBRARY(SSL_EAY NAMES ssleay32
${OPENSSL_ROOT_DIR}/lib PATHS ${OPENSSL_ROOT_DIR}/lib
) )
MARK_AS_ADVANCED(SSL_EAY LIB_EAY) MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )