diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index f0a45f5c..88980ea1 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -164,7 +164,7 @@ if(NOT HAVE_GCC_BYTESWAP) endif() endif() -# Check if your compiler supports some safer version of vsprintf. +# Determine whether your compiler supports some safer version of vsprintf. check_cxx_source_compiles(" #include @@ -190,15 +190,17 @@ if(NOT HAVE_VSNPRINTF) " HAVE_VSPRINTF_S) endif() -# Check if zlib is installed. +# Check for libz using the cmake supplied FindZLIB.cmake if(NOT ZLIB_SOURCE) find_package(ZLIB) - set(HAVE_ZLIB ZLIB_FOUND) + if(ZLIB_FOUND) + set(HAVE_ZLIB 1) + else() + set(HAVE_ZLIB 0) + endif() endif() -# Check if CppUnit is installed. - if(BUILD_TESTS) find_package(CppUnit) if(NOT CppUnit_FOUND)