diff --git a/AUTHORS b/AUTHORS index 33447a6a..08ac7d9b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -53,6 +53,7 @@ Contributors: Stewart Brodie (bug fix: no fork mode failure reporting with teardowns) Michał Dębski (Use mkstemp() if available instead of tmpfile() or tempnam()) Sebastian Dröge (Kill running tests if SIGTERM or SIGINT are caught in test runner) + Matt Clarkson (Fix CMake checks using time.h for MinGW and MSVC) Anybody who has contributed code to Check or Check's build system is considered an author. Send patches to this file to diff --git a/CMakeLists.txt b/CMakeLists.txt index 9aee07df..46c48c75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,15 +217,19 @@ check_type_size(uint64_t UINT64_T) check_type_size(uintmax_t UINTMAX_T) # +set(CMAKE_EXTRA_INCLUDE_FILES time.h) check_type_size(clock_t CLOCK_T) if(NOT HAVE_CLOCK_T) set(clock_t int) endif(NOT HAVE_CLOCK_T) +unset(CMAKE_EXTRA_INCLUDE_FILES) # +set(CMAKE_EXTRA_INCLUDE_FILES time.h) check_type_size(clockid_t CLOCKID_T) if(NOT HAVE_CLOCKID_T) set(clockid_t int) endif(NOT HAVE_CLOCKID_T) +unset(CMAKE_EXTRA_INCLUDE_FILES) # check_type_size(size_t SIZE_T) if(NOT HAVE_SIZE_T) @@ -254,10 +258,12 @@ if(NOT HAVE_PID_T) endif(WIN32) endif(NOT HAVE_PID_T) # +set(CMAKE_EXTRA_INCLUDE_FILES time.h) check_type_size(timer_t TIMER_T) if(NOT HAVE_TIMER_T) set(timer_t int) endif(NOT HAVE_TIMER_T) +unset(CMAKE_EXTRA_INCLUDE_FILES) ############################################################################### # Check libraries diff --git a/NEWS b/NEWS index 15864b4d..8922db2c 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,10 @@ In Development: # Mentioning Check 0.9.14 for now, to fix distcheck target until next release +* CMake on MinGW and MSVC was unable to find time related types because + time.h was not included. This header is now included for the checks. + Patch #53. + * If the test runner process catches a SIGTERM or SIGINT signal the running tests are now also killed. Patch #52.