diff options
| author | Andreas Schneider <asn@cynapses.org> | 2010-12-30 00:26:37 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cynapses.org> | 2010-12-30 00:26:37 +0100 |
| commit | 1646ce970cad7934a0dd661045fc323c649df61e (patch) | |
| tree | 8a3b760127c797eb98efd439337abb03529a91e0 /cmake/Modules/FindOpenSSL.cmake | |
| parent | 08906e0f7f28e5e90918d95a5bf0acf4f5a4982d (diff) | |
| download | libssh-1646ce970cad7934a0dd661045fc323c649df61e.tar.gz libssh-1646ce970cad7934a0dd661045fc323c649df61e.tar.xz libssh-1646ce970cad7934a0dd661045fc323c649df61e.zip | |
cmake: Fixed find modules on Windows.
Diffstat (limited to 'cmake/Modules/FindOpenSSL.cmake')
| -rw-r--r-- | cmake/Modules/FindOpenSSL.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/Modules/FindOpenSSL.cmake b/cmake/Modules/FindOpenSSL.cmake index b024ff46..50b65c25 100644 --- a/cmake/Modules/FindOpenSSL.cmake +++ b/cmake/Modules/FindOpenSSL.cmake @@ -13,14 +13,10 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. # - if (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) # in cache already set(OPENSSL_FOUND TRUE) else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) - if (WIN32) - set(_OPENSSL_DIR $ENV{PROGRAMFILES}/OpenSSL) - endif (WIN32) find_package(PkgConfig) if (PKG_CONFIG_FOUND) @@ -38,6 +34,8 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) /opt/local/include /sw/include /usr/lib/sfw/include + $ENV{PROGRAMFILES}/OpenSSL/include + $ENV{PROGRAMFILES}/OpenSSL-Win32/include ) find_library(SSL_LIBRARY @@ -53,6 +51,8 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) /sw/lib /usr/sfw/lib/64 /usr/sfw/lib + $ENV{PROGRAMFILES}/OpenSSL/lib + $ENV{PROGRAMFILES}/OpenSSL-Win32/lib ) find_library(SSLEAY32_LIBRARY |