diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-01-23 13:47:24 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-01-23 15:43:38 +0000 |
| commit | ccf37e39054a9fc22f4afb6ef5e3841a5a67c227 (patch) | |
| tree | 49566e68f141053d107818cc009a85366c9fbec9 /cmake/modules/FindZLIB.cmake | |
| parent | 9681df7983d2808d74de093d86894cf818bd37b1 (diff) | |
CMake: fix failure to locate zlib (and possibly libssh)
Include directories are no longer globally included, be explicit with
the required include directories or else function checks will fail.
Change-Id: I72d88f94854fcfe6529554f84e49d1dba696e9df
Fixes: v2.9.1rc0-436-ga3991874eb ("CMake: Replace PACKAGELIST magic")
Reviewed-on: https://code.wireshark.org/review/31693
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'cmake/modules/FindZLIB.cmake')
| -rw-r--r-- | cmake/modules/FindZLIB.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/modules/FindZLIB.cmake b/cmake/modules/FindZLIB.cmake index 91b1270d01..909961b8eb 100644 --- a/cmake/modules/FindZLIB.cmake +++ b/cmake/modules/FindZLIB.cmake @@ -103,7 +103,8 @@ ELSE() INCLUDE(CMakePushCheckState) INCLUDE(CheckFunctionExists) CMAKE_PUSH_CHECK_STATE() - SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARY}) + set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARY}) # # Check for inflate() in zlib, to make sure the zlib library is # usable. |