diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-10-04 15:42:23 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-10-04 15:42:23 +0000 |
| commit | 6c498c7420e2761e3cd2a1ad1667fe8452c6e3cd (patch) | |
| tree | 8fd6e0a12a1edf68623b46e4260819e8cbac1ab6 /cmake | |
| parent | 8f46fd54438817be96f87b52a581fa7e50292dce (diff) | |
Add Win support (and add a "hacked" case where the zlib
stuff has been compiled in place but not installed)
svn path=/trunk/; revision=52363
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindZLIB.cmake | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/cmake/modules/FindZLIB.cmake b/cmake/modules/FindZLIB.cmake index f3d15302d9..595111c15d 100644 --- a/cmake/modules/FindZLIB.cmake +++ b/cmake/modules/FindZLIB.cmake @@ -34,14 +34,26 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -FIND_PATH(ZLIB_INCLUDE_DIR zlib.h - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include" +INCLUDE(FindWSWinLibs) +FindWSWinLibs("zlib" "ZLIB_HINTS") + +FIND_PATH(ZLIB_INCLUDE_DIR + NAMES + zlib.h + HINTS + ${ZLIB_HINTS}/include + ${ZLIB_HINTS} + PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include" ) SET(ZLIB_NAMES z zlib zdll zlib1 zlibd zlibd1) FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} + HINTS + ${ZLIB_HINTS}/lib + ${ZLIB_HINTS} PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/lib" ) |