From 130654316bd039f8b7d9132246b2dadcebcca8d6 Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Mon, 21 Dec 2015 13:54:02 +0900 Subject: [PATCH] Backport some comments from tablib2 branch. --- ConfigureChecks.cmake | 4 +++- config.h.cmake | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 3d2632c0..a9f9f17a 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -212,7 +212,7 @@ check_cxx_source_compiles(" } " HAVE_ISO_STRDUP) -# Check for libz using the cmake supplied FindZLIB.cmake +# Determine whether zlib is installed. if(NOT ZLIB_SOURCE) find_package(ZLIB) @@ -223,6 +223,8 @@ if(NOT ZLIB_SOURCE) endif() endif() +# Determine whether CppUnit is installed. + if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS) find_package(CppUnit) if(NOT CppUnit_FOUND) diff --git a/config.h.cmake b/config.h.cmake index 55affab6..7ac72410 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -20,10 +20,10 @@ #cmakedefine HAVE_VSNPRINTF 1 #cmakedefine HAVE_VSPRINTF_S 1 -/* Defined if your compiler supports ISO _strdup. */ +/* Defined if your compiler supports ISO _strdup */ #cmakedefine HAVE_ISO_STRDUP 1 -/* Defined if you have libz */ +/* Defined if zlib is installed */ #cmakedefine HAVE_ZLIB 1 /* Indicates whether debug messages are shown even in release mode */