lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00
Code Activity

cmake: Fixed find modules on Windows.

Browse Source
This commit is contained in:
Andreas Schneider
2010-12-30 00:26:37 +01:00
parent 08906e0f7f
commit 1646ce970c
5 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/Modules/FindZLIB.cmake
View File

@@ -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