From 739234afb9f9c644afacbb7fd8e8a3a421adf63b Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 12 May 2010 13:55:32 +0200 Subject: 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(+) (limited to 'cmake') diff --git a/cmake/Modules/FindOpenSSL.cmake b/cmake/Modules/FindOpenSSL.cmake index 79f44821..53e83eac 100644 --- a/cmake/Modules/FindOpenSSL.cmake +++ b/cmake/Modules/FindOpenSSL.cmake @@ -27,6 +27,7 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) NAMES openssl/ssl.h PATHS + ${_OPENSSL_DIR}/include ${_OPENSSL_INCLUDEDIR} /usr/include /usr/local/include @@ -40,6 +41,7 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) ssl libssl PATHS + ${_OPENSSL_DIR}/lib ${_OPENSSL_LIBDIR} /usr/lib /usr/local/lib @@ -53,6 +55,7 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) NAMES ssleay32 PATHS + ${_OPENSSL_DIR}/lib ${_OPENSSL_LIBDIR} /usr/lib /usr/local/lib @@ -66,6 +69,7 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) NAMES ssleay32MD PATHS + ${_OPENSSL_DIR}/lib ${_OPENSSL_LIBDIR} /usr/lib /usr/local/lib @@ -84,6 +88,7 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) libeay libeay32 PATHS + ${_OPENSSL_DIR}/lib ${_OPENSSL_LIBDIR} /usr/lib /usr/local/lib diff --git a/cmake/Modules/FindZLIB.cmake b/cmake/Modules/FindZLIB.cmake index 4c97979f..c7b28e39 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 -- cgit v1.2.3