URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=63fcb64f2a8b000613d6c723493691bb5044e375
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark
Commits:
63fcb64 by Guy Harris (guy@xxxxxxxxxxxx):
Do FIND_PACKAGE_HANDLE_STANDARD_ARGS() before checking ZLIB_FOUND.
It's what sets {package}_FOUND.
Combine two "do this if zlib was found" blocks.
Change-Id: I55062a11c7ae7e6f32886615a0201df55f700d1e
Reviewed-on: https://code.wireshark.org/review/32974
Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
(cherry picked from commit 5ae6a9bea6ba943e6c674799a7b906b3dffed157)
Reviewed-on: https://code.wireshark.org/review/32981
Actions performed:
from cfeadc6 Don't look for zlib stuff if we didn't find zlib.
add 63fcb64 Do FIND_PACKAGE_HANDLE_STANDARD_ARGS() before checking ZLIB_FOUND.
Summary of changes:
cmake/modules/FindZLIB.cmake | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)