From: Nathan Moinvaziri Date: Tue, 12 May 2020 13:24:01 +0000 (-0400) Subject: Group check_include_file together in CMakeLists.txt. X-Git-Tag: 1.9.9-b1~271 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4b5542d6655a0ea98d1b25ace7896bedebba787;p=thirdparty%2Fzlib-ng.git Group check_include_file together in CMakeLists.txt. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 82eb0601..cdf74eff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,11 +69,6 @@ else() add_feature_info(CMAKE_BUILD_TYPE 1 "Build type: ${CMAKE_BUILD_TYPE} (selected)") endif() -check_include_file(sys/types.h HAVE_SYS_TYPES_H) -check_include_file(stdint.h HAVE_STDINT_H) -check_include_file(stddef.h HAVE_STDDEF_H) -check_include_file(sys/sdt.h HAVE_SYS_SDT_H) - # # Options parsing # @@ -274,6 +269,15 @@ if(WITH_CODE_COVERAGE) endif() endif() +# +# Check for stndard/system includes +# +check_include_file(sys/types.h HAVE_SYS_TYPES_H) +check_include_file(stdint.h HAVE_STDINT_H) +check_include_file(stddef.h HAVE_STDDEF_H) +check_include_file(sys/sdt.h HAVE_SYS_SDT_H) +check_include_file(unistd.h Z_HAVE_UNISTD_H) + # # Check to see if we have large file support # @@ -303,11 +307,6 @@ if(NOT HAVE_STRERROR) add_definitions(-DNO_STRERROR) endif() -# -# Check for unistd.h and stdarg.h -# -check_include_file(unistd.h Z_HAVE_UNISTD_H) - if(WITH_MSAN AND WITH_SANITIZERS) message(FATAL_ERROR "Memory sanitizer is incompatible with address sanitizer") elseif(WITH_MSAN)