From 9970b1fd7daa3ab9174a1822925d5c604fd09afd Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 12 May 2010 13:57:54 +0200 Subject: [PATCH] Added the possibility to define _OPENSSL_DIR and _ZLIB_DIR. --- cmake/Modules/FindOpenSSL.cmake | 5 +++++ cmake/Modules/FindZLIB.cmake | 2 ++ 2 files changed, 7 insertions(+) diff --git a/cmake/Modules/FindOpenSSL.cmake b/cmake/Modules/FindOpenSSL.cmake index 6116cf58..91bded7b 100644 --- a/cmake/Modules/FindOpenSSL.cmake +++ b/cmake/Modules/FindOpenSSL.cmake @@ -34,6 +34,7 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) NAMES openssl/ssl.h PATHS + ${_OPENSSL_DIR}/include ${_OPENSSL_INCLUDEDIR} /usr/include /usr/local/include @@ -49,6 +50,7 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) ssl libssl PATHS + ${_OPENSSL_DIR}/lib ${_OPENSSL_LIBDIR} /usr/lib /usr/local/lib @@ -64,6 +66,7 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) NAMES ssleay32 PATHS + ${_OPENSSL_DIR}/lib ${_OPENSSL_LIBDIR} /usr/lib /usr/local/lib @@ -79,6 +82,7 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) NAMES ssleay32MD PATHS + ${_OPENSSL_DIR}/lib ${_OPENSSL_LIBDIR} /usr/lib /usr/local/lib @@ -99,6 +103,7 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) libeay libeay32 PATHS + ${_OPENSSL_DIR}/lib ${_OPENSSL_LIBDIR} /lib /usr/lib diff --git a/cmake/Modules/FindZLIB.cmake b/cmake/Modules/FindZLIB.cmake index e9d14b01..6370c771 100644 --- a/cmake/Modules/FindZLIB.cmake +++ b/cmake/Modules/FindZLIB.cmake @@ -23,6 +23,7 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS) NAMES zlib.h PATHS + ${_ZLIB_DIR}/include /usr/include /usr/local/include /opt/local/include @@ -36,6 +37,7 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS) zlib zlib1 PATHS + ${_ZLIB_DIR}/lib /usr/lib /usr/local/lib /opt/local/lib