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/FindZLIB.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/FindZLIB.cmake')
| -rw-r--r-- | cmake/Modules/FindZLIB.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmake/Modules/FindZLIB.cmake b/cmake/Modules/FindZLIB.cmake index a9fdfa9b..f0b969c6 100644 --- a/cmake/Modules/FindZLIB.cmake +++ b/cmake/Modules/FindZLIB.cmake @@ -18,9 +18,6 @@ if (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS) # in cache already set(ZLIB_FOUND TRUE) else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS) - if (WIN32) - set(_ZLIB_DIR $ENV{PROGRAMFILES}/GnuWin32) - endif (WIN32) find_path(ZLIB_INCLUDE_DIR NAMES @@ -32,6 +29,8 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS) /opt/local/include /sw/include /usr/lib/sfw/include + $ENV{PROGRAMFILES}/GnuWin32/include + $ENV{PROGRAMFILES}/zlib/include ) find_library(Z_LIBRARY @@ -47,6 +46,8 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS) /sw/lib /usr/sfw/lib/64 /usr/sfw/lib + $ENV{PROGRAMFILES}/GnuWin32/lib + $ENV{PROGRAMFILES}/zlib/lib ) set(ZLIB_INCLUDE_DIRS |