Merge branch 'master' into fix-small-issues-2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c822ea03fbc58fe47bb7d93dff2f46e74411461..0edfd0068d00274658ed53e20fb555799f108493 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,9 +19,15 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 #
-project(check C)
+cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+project(check
+  DESCRIPTION "Unit Testing Framework for C"
+  LANGUAGES C)
+
+###############################################################################
+# Configure a project for testing with CTest/CDash
+include(CTest)
 
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 macro(extract_version file setting_name)
@@ -34,6 +40,12 @@ extract_version(configure.ac CHECK_MAJOR_VERSION)
 extract_version(configure.ac CHECK_MINOR_VERSION)
 extract_version(configure.ac CHECK_MICRO_VERSION)
 
+set(PROJECT_VERSION_MAJOR ${CHECK_MAJOR_VERSION})
+set(PROJECT_VERSION_MINOR ${CHECK_MINOR_VERSION})
+set(PROJECT_VERSION_PATCH ${CHECK_MICRO_VERSION})
+set(PROJECT_VERSION_TWEAK 0)
+set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}")
+
 set(check_VERSION
   "${CHECK_MAJOR_VERSION}.${CHECK_MINOR_VERSION}.${CHECK_MICRO_VERSION}")
 
@@ -52,15 +64,24 @@ set(CMAKE_C_EXTENSIONS ON)          # Use GNU extensions and POSIX standard
 ###############################################################################
 # Option
 option(CHECK_ENABLE_TESTS
-  "Enable the compilation and running of Check's unit tests" ON)
+  "Deprecated: Enable the compilation and running of Check's unit tests" ON)
+if(NOT CHECK_ENABLE_TESTS)
+  message(DEPRECATION "The option CHECK_ENABLE_TESTS is deprecated. Use option BUILD_TESTING.")
+  # TODO Remove this option by Check 0.15.0!
+endif(NOT CHECK_ENABLE_TESTS)
+option(CHECK_ENABLE_GCOV
+  "Turn on test coverage" OFF)
+if (CHECK_ENABLE_GCOV AND NOT ${CMAKE_C_COMPILER_ID} MATCHES "GNU")
+  message(FATAL_ERROR "Code Coverage (gcov) only works if GNU compiler is used!")
+endif (CHECK_ENABLE_GCOV AND NOT ${CMAKE_C_COMPILER_ID} MATCHES "GNU")
 
 ###############################################################################
 # Check system and architecture
 if(WIN32)
   if(MSVC60)
-    set(WINVER 0x0400)
+  set(WINVER 0x0400)
   else()
-    set(WINVER 0x0500)
+  set(WINVER 0x0500)
   endif()
   set(_WIN32_WINNT ${WINVER})
 endif(WIN32)
@@ -109,6 +130,7 @@ ck_check_include_file("string.h" HAVE_STRING_H)
 ck_check_include_file("strings.h" HAVE_STRINGS_H)
 ck_check_include_file("sys/time.h" HAVE_SYS_TIME_H)
 ck_check_include_file("time.h" HAVE_TIME_H)
+ck_check_include_file("unistd.h" HAVE_UNISTD_H)
 
 ###############################################################################
 # Check functions
@@ -126,6 +148,7 @@ check_function_exists(strdup HAVE_DECL_STRDUP)
 check_function_exists(strsignal HAVE_DECL_STRSIGNAL)
 check_function_exists(_getpid HAVE__GETPID)
 check_function_exists(_strdup HAVE__STRDUP)
+check_function_exists(alarm HAVE_DECL_ALARM)
 if (HAVE_REGEX_H)
   check_function_exists(regcomp HAVE_REGCOMP)
   check_function_exists(regexec HAVE_REGEXEC)
@@ -138,38 +161,46 @@ check_symbol_exists(snprintf stdio.h HAVE_SNPRINTF_SYMBOL)
 check_symbol_exists(vsnprintf stdio.h HAVE_VSNPRINTF_SYMBOL)
 
 if(NOT HAVE_SNPRINTF_FUNCTION AND NOT HAVE_SNPRINTF_SYMBOL)
-    add_definitions(-Dsnprintf=rpl_snprintf)
-    set(snprintf rpl_snprintf)
-    add_definitions(-Dvsnprintf=rpl_vsnprintf)
-    set(vsnprintf rpl_vsnprintf)
+  add_definitions(-Dsnprintf=rpl_snprintf)
+  set(snprintf rpl_snprintf)
+  add_definitions(-Dvsnprintf=rpl_vsnprintf)
+  set(vsnprintf rpl_vsnprintf)
 else(NOT HAVE_SNPRINTF_FUNCTION AND NOT HAVE_SNPRINTF_SYMBOL)
-    set(HAVE_SNPRINTF 1)
-    add_definitions(-DHAVE_SNPRINTF=1)
-    set(HAVE_VSNPRINTF 1)
-    add_definitions(-DHAVE_VSNPRINTF=1)
+  set(HAVE_SNPRINTF 1)
+  add_definitions(-DHAVE_SNPRINTF=1)
+  set(HAVE_VSNPRINTF 1)
+  add_definitions(-DHAVE_VSNPRINTF=1)
 endif(NOT HAVE_SNPRINTF_FUNCTION AND NOT HAVE_SNPRINTF_SYMBOL)
 
 if(HAVE_FORK)
-    add_definitions(-DHAVE_FORK=1)
-    set(HAVE_FORK 1)
+  add_definitions(-DHAVE_FORK=1)
+  set(HAVE_FORK 1)
 else(HAVE_FORK)
-    add_definitions(-DHAVE_FORK=0)
-    set(HAVE_FORK 0)
+  add_definitions(-DHAVE_FORK=0)
+  set(HAVE_FORK 0)
 endif(HAVE_FORK)
 
 if(HAVE_MKSTEMP)
-    add_definitions(-DHAVE_MKSTEMP=1)
-    set(HAVE_MKSTEMP 1)
+  add_definitions(-DHAVE_MKSTEMP=1)
+  set(HAVE_MKSTEMP 1)
 else(HAVE_MKSTEMP)
-    add_definitions(-DHAVE_MKSTEMP=0)
-    set(HAVE_MKSTEMP 0)
+  add_definitions(-DHAVE_MKSTEMP=0)
+  set(HAVE_MKSTEMP 0)
 endif(HAVE_MKSTEMP)
 
+if(HAVE_DECL_ALARM)
+  add_definitions(-DHAVE_DECL_ALARM=1)
+  set(HAVE_DECL_ALARM 1)
+else(HAVE_DECL_ALARM)
+  add_definitions(-DHAVE_DECL_ALARM=0)
+  set(HAVE_DECL_ALARM 0)
+endif(HAVE_DECL_ALARM)
+
 if(HAVE_REGEX_H AND HAVE_REGCOMP AND HAVE_REGEXEC)
-    add_definitions(-DHAVE_REGEX=1)
-    set(HAVE_REGEX 1)
-    add_definitions(-DENABLE_REGEX=1)
-    set(ENABLE_REGEX 1)
+  add_definitions(-DHAVE_REGEX=1)
+  set(HAVE_REGEX 1)
+  add_definitions(-DENABLE_REGEX=1)
+  set(ENABLE_REGEX 1)
 endif()
 
 
@@ -190,39 +221,39 @@ check_symbol_exists(INT64_MIN "${headers}" HAVE_INT64_MIN)
 check_symbol_exists(UINT32_MAX "${headers}" HAVE_UINT32_MAX)
 check_symbol_exists(UINT64_MAX "${headers}" HAVE_UINT64_MAX)
 check_symbol_exists(SIZE_MAX "${headers}" HAVE_SIZE_MAX)
-check_symbol_exists(SSIZE_MAX "limits.h"   HAVE_SSIZE_MAX)
+check_symbol_exists(SSIZE_MAX "limits.h" HAVE_SSIZE_MAX)
 
 ###############################################################################
 # Check struct members
 
 # Check for  tv_sec in struct timeval
 if(NOT HAVE_SYS_TIME_H)
-    if(MSVC)
-        check_struct_member("struct timeval" tv_sec "Winsock2.h" HAVE_STRUCT_TIMEVAL_TV_SEC)
-        check_struct_member("struct timeval" tv_usec "Winsock2.h" HAVE_STRUCT_TIMEVAL_TV_USEC)
-        check_struct_member("struct timespec" tv_sec "Winsock2.h" HAVE_WINSOCK2_H_STRUCT_TIMESPEC_TV_SEC)
-        check_struct_member("struct timespec" tv_sec "time.h" HAVE_TIME_H_STRUCT_TIMESPEC_TV_SEC)
-        check_struct_member("struct itimerspec" it_value "Winsock2.h" HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
-
-        if(NOT HAVE_WINSOCK2_H_STRUCT_TIMESPEC_TV_SEC AND NOT HAVE_TIME_H_STRUCT_TIMESPEC_TV_SEC)
-            add_definitions(-DSTRUCT_TIMESPEC_DEFINITION_MISSING=1)
-            set(STRUCT_TIMESPEC_DEFINITION_MISSING 1)
-        endif(NOT HAVE_WINSOCK2_H_STRUCT_TIMESPEC_TV_SEC AND NOT HAVE_TIME_H_STRUCT_TIMESPEC_TV_SEC)
-
-        if(NOT HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
-            add_definitions(-DSTRUCT_ITIMERSPEC_DEFINITION_MISSING=1)
-            set(STRUCT_ITIMERSPEC_DEFINITION_MISSING 1)
-        endif(NOT HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
-    endif(MSVC)
+  if(MSVC)
+    check_struct_member("struct timeval" tv_sec "Winsock2.h" HAVE_STRUCT_TIMEVAL_TV_SEC)
+    check_struct_member("struct timeval" tv_usec "Winsock2.h" HAVE_STRUCT_TIMEVAL_TV_USEC)
+    check_struct_member("struct timespec" tv_sec "Winsock2.h" HAVE_WINSOCK2_H_STRUCT_TIMESPEC_TV_SEC)
+    check_struct_member("struct timespec" tv_sec "time.h" HAVE_TIME_H_STRUCT_TIMESPEC_TV_SEC)
+    check_struct_member("struct itimerspec" it_value "Winsock2.h" HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
+
+    if(NOT HAVE_WINSOCK2_H_STRUCT_TIMESPEC_TV_SEC AND NOT HAVE_TIME_H_STRUCT_TIMESPEC_TV_SEC)
+      add_definitions(-DSTRUCT_TIMESPEC_DEFINITION_MISSING=1)
+      set(STRUCT_TIMESPEC_DEFINITION_MISSING 1)
+    endif(NOT HAVE_WINSOCK2_H_STRUCT_TIMESPEC_TV_SEC AND NOT HAVE_TIME_H_STRUCT_TIMESPEC_TV_SEC)
+
+    if(NOT HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
+      add_definitions(-DSTRUCT_ITIMERSPEC_DEFINITION_MISSING=1)
+      set(STRUCT_ITIMERSPEC_DEFINITION_MISSING 1)
+    endif(NOT HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
+  endif(MSVC)
 endif(NOT HAVE_SYS_TIME_H)
 
 # OSX has sys/time.h, but it still lacks itimerspec
 if(HAVE_SYS_TIME_H)
-    check_struct_member("struct itimerspec" it_value "sys/time.h" HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
-    if(NOT HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
-        add_definitions(-DSTRUCT_ITIMERSPEC_DEFINITION_MISSING=1)
-        set(STRUCT_ITIMERSPEC_DEFINITION_MISSING 1)
-    endif(NOT HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
+  check_struct_member("struct itimerspec" it_value "sys/time.h" HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
+  if(NOT HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
+    add_definitions(-DSTRUCT_ITIMERSPEC_DEFINITION_MISSING=1)
+    set(STRUCT_ITIMERSPEC_DEFINITION_MISSING 1)
+  endif(NOT HAVE_STRUCT_ITIMERSPEC_IT_VALUE)
 endif(HAVE_SYS_TIME_H)
 
 ###############################################################################
@@ -304,36 +335,102 @@ unset(CMAKE_EXTRA_INCLUDE_FILES)
 
 check_library_exists(m floor "" HAVE_LIBM)
 if (HAVE_LIBM)
-    set (LIBM "m")
+  set (LIBM "m")
 endif (HAVE_LIBM)
 
 check_library_exists(rt clock_gettime "" HAVE_LIBRT)
 if (HAVE_LIBRT)
-    set(LIBRT "rt")
-    ADD_DEFINITIONS(-DHAVE_LIBRT=1)
+  set(LIBRT "rt")
+  ADD_DEFINITIONS(-DHAVE_LIBRT=1)
 endif (HAVE_LIBRT)
 
 check_library_exists(subunit subunit_test_start "" HAVE_SUBUNIT)
 if (HAVE_SUBUNIT)
-    set(SUBUNIT "subunit")
-    set(ENABLE_SUBUNIT 1)
-    add_definitions(-DENABLE_SUBUNIT=1)
+  set(SUBUNIT "subunit")
+  set(ENABLE_SUBUNIT 1)
+  add_definitions(-DENABLE_SUBUNIT=1)
 else(HAVE_SUBUNIT)
-    set(ENABLE_SUBUNIT 0)
-    add_definitions(-DENABLE_SUBUNIT=0)
+  set(ENABLE_SUBUNIT 0)
+  add_definitions(-DENABLE_SUBUNIT=0)
 endif (HAVE_SUBUNIT)
 
 ###############################################################################
 # Generate "config.h" from "cmake/config.h.in"
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+  # Param @ONLY not used on purpose!
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 add_definitions(-DHAVE_CONFIG_H)
 set(CONFIG_HEADER ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+###############################################################################
+# Generate "check_stdint.h" from "cmake/check_stdint.h.in"
+#
+# The corresponding GNU Autotools build of this project
+# has m4 macro `m4/ax_create_stdint_h.m4` to create
+# the file `check_stdint.h` from scratch.
+# Include file `stdint.h` was introduced in C99 ANSI standard but
+# many compilers were lacking behind or still are and
+# have not implemented C99 or their `stdint.h` is not compatible.
+# Therefore the m4 macro was needed to create the required datatypes.
+#
+# When converting to CMake we also want to abandon the m4 macros.
+#
+set(PROJECT_VERSION "${check_VERSION}")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/check_stdint.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/check_stdint.h)
+  ${CMAKE_CURRENT_BINARY_DIR}/check_stdint.h @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/check_stdint.h DESTINATION include)
 
+###############################################################################
+# Generate "check.pc", the package config (pkgconfig) file for libtool
+set(prefix_save "${PREFIX}")
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(exec_prefix "\${prefix}")
+set(libdir "\${exec_prefix}/lib")
+set(includedir "\${prefix}/include")
+
+if (HAVE_SUBUNIT)
+  set(LIBSUBUNIT_PC "libsubunit")
+else (HAVE_SUBINIT)
+  set(LIBSUBUNIT_PC "")
+endif (HAVE_SUBUNIT)
+
+if (CHECK_ENABLE_GCOV)
+  set(GCOV_LIBS "-lgcov")
+else (CHECK_ENABLE_GCOV)
+  set(GCOV_LIBS "")
+endif (CHECK_ENABLE_GCOV)
+
+set(PTHREAD_LIBS "")
+set(LIBS "")
+
+if (HAVE_LIBM)
+  set(LIBS "${LIBS} -lm")
+endif (HAVE_LIBM)
+
+if (HAVE_LIBRT)
+  set(LIBS "${LIBS} -lrt")
+endif (HAVE_LIBRT)
+
+set(PTHREAD_CFLAGS "-pthread")
+
+configure_file(check.pc.in check.pc @ONLY)
+
+unset(PTHREAD_CFLAGS)
+unset(LIBS)
+unset(PTHREAD_LIBS)
+unset(GCOV_LIBS)
+unset(LIBSUBUNIT_PC)
+unset(includedir)
+unset(libdir)
+unset(exec_prefix)
+set(PREFIX "${prefix_save}")
+
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/check.pc
+  DESTINATION lib/pkgconfig
+)
+
 ###############################################################################
 # Subdirectories
 add_subdirectory(lib)
@@ -342,37 +439,36 @@ add_subdirectory(checkmk)
 
 ###############################################################################
 # Unit tests
-if (CHECK_ENABLE_TESTS)
+if (BUILD_TESTING)
   add_subdirectory(tests)
-  enable_testing()
   add_test(NAME check_check COMMAND check_check)
   add_test(NAME check_check_export COMMAND check_check_export)
 
   # Only offer to run shell scripts if we may have a working interpreter
   if(UNIX OR MINGW OR MSYS)
-    add_test(NAME test_output.sh
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
-      COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_output.sh)
-    add_test(NAME test_log_output.sh
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
-      COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_log_output.sh)
-    add_test(NAME test_xml_output.sh
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
-      COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_xml_output.sh)
-    add_test(NAME test_tap_output.sh
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
-      COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_tap_output.sh)
-    add_test(NAME test_check_nofork.sh
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
-      COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_check_nofork.sh)
-    add_test(NAME test_check_nofork_teardown.sh
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
-      COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_check_nofork_teardown.sh)
-    add_test(NAME test_set_max_msg_size.sh
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
-      COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_set_max_msg_size.sh)
+  add_test(NAME test_output.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_output.sh)
+  add_test(NAME test_log_output.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_log_output.sh)
+  add_test(NAME test_xml_output.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_xml_output.sh)
+  add_test(NAME test_tap_output.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_tap_output.sh)
+  add_test(NAME test_check_nofork.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_check_nofork.sh)
+  add_test(NAME test_check_nofork_teardown.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_check_nofork_teardown.sh)
+  add_test(NAME test_set_max_msg_size.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_set_max_msg_size.sh)
   endif(UNIX OR MINGW OR MSYS)
-endif()
+endif (BUILD_TESTING)
 
 ###############################################################################
 # Export project, prepare a config and config-version files
@@ -380,30 +476,30 @@ set(LIB_INSTALL_DIR lib CACHE FILEPATH "lib INSTALL DIR")
 set(EXPORT_NAME ${PROJECT_NAME})
 include(CMakePackageConfigHelpers)
 configure_package_config_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${EXPORT_NAME}-config.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config.cmake
-    INSTALL_DESTINATION ${LIB_INSTALL_DIR}/${EXPORT_NAME}/cmake
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${EXPORT_NAME}-config.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config.cmake
+  INSTALL_DESTINATION ${LIB_INSTALL_DIR}/${EXPORT_NAME}/cmake
 )
 write_basic_package_version_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config-version.cmake
-    VERSION ${check_VERSION}
-    COMPATIBILITY AnyNewerVersion
+  ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config-version.cmake
+  VERSION ${check_VERSION}
+  COMPATIBILITY AnyNewerVersion
 )
 
 export(EXPORT check-targets
-    FILE "${CMAKE_CURRENT_BINARY_DIR}/check-targets.cmake"
-    NAMESPACE Check::
+  FILE "${CMAKE_CURRENT_BINARY_DIR}/check-targets.cmake"
+  NAMESPACE Check::
 )
 
 install(EXPORT check-targets
-    NAMESPACE Check::
-    FILE check-targets.cmake
-    DESTINATION lib/cmake/${EXPORT_NAME}
+  NAMESPACE Check::
+  FILE check-targets.cmake
+  DESTINATION lib/cmake/${EXPORT_NAME}
 )
 install(
-    FILES
-        "${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config-version.cmake"
-    DESTINATION lib/cmake/${EXPORT_NAME}
+  FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config-version.cmake"
+  DESTINATION lib/cmake/${EXPORT_NAME}
 )
 

diff --git a/appveyor.yml b/appveyor.yml
index f6760bdd27ec5026afa50d8cf692cee881703896..ec6d03cb4c8c2db192b097f6c3396334c6ed0f45 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -111,6 +111,7 @@ before_build:
   - if %platform%==msvc call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
   - if %platform%==msvc mkdir build
   - if %platform%==msvc chdir build
+  - if %platform%==msvc cmake --version
   - if %platform%==msvc cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%P% -DCMAKE_BUILD_TYPE=Debug ..
   - if %platform%==vs (
       set "makecommand=Visual Studio"
@@ -158,6 +159,7 @@ before_build:
     )
   - if %platform%==vs mkdir build
   - if %platform%==vs chdir build
+  - if %platform%==vs cmake --version
   - if %platform%==vs cmake -G "%makecommand%" -DCMAKE_INSTALL_PREFIX=%P% -DCMAKE_BUILD_TYPE=Debug ..
   - if %platform%==cygwin set PATH=C:\cygwin\bin;%PATH%
   - if %platform%==cygwin bash -c "autoreconf -i"
@@ -165,6 +167,7 @@ before_build:
   - if %platform%==mingw32 set PATH=C:\MinGW\bin;%PATH%
   - if %platform%==mingw32 mkdir build
   - if %platform%==mingw32 chdir build
+  - if %platform%==mingw32 cmake --version
   - if %platform%==mingw32 cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=%P% -DCMAKE_BUILD_TYPE=Debug ..
   - if %platform%==mingw64msys set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
   - if %platform%==mingw64msys bash -c "autoreconf -i"

diff --git a/cmake/check_stdint.h.in b/cmake/check_stdint.h.in
index ab467c1f81906318236b32d100792fae5d05441e..13f284a9a0f3f6dd2182ea0e53e37346d372a551 100644 (file)
--- a/cmake/check_stdint.h.in
+++ b/cmake/check_stdint.h.in
@@ -1,6 +1,41 @@
+/*-*- mode:C; -*- */
+/*
+ * Check: a unit test framework for C
+ *
+ * Copyright (C) 2013 Branden Archer
+ * Copyright (C) 2019 Mikko Johannes Koivunalho
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #ifndef _CHECK_CHECK_STDINT_H
 #define _CHECK_CHECK_STDINT_H 1
+#ifndef _GENERATED_STDINT_H
+#define _GENERATED_STDINT_H "@PROJECT_NAME@ @PROJECT_VERSION@"
+/* generated using CMake @CMAKE_VERSION@ from file cmake/check_stdint.h.in */
+
+/* Imported CMake variables created during build. */
+#cmakedefine HAVE_STDINT_H 1
+
 #ifdef HAVE_STDINT_H
+#define _STDINT_HAVE_STDINT_H 1
 #include <stdint.h>
-#endif
-#endif
+#undef HAVE_STDINT_H
+#endif /* defined HAVE_STDINT_H */
+
+/* Define only once */
+#endif /* _GENERATED_STDINT_H */
+#endif /* _CHECK_CHECK_STDINT_H */

diff --git a/cmake/config.h.in b/cmake/config.h.in
index aaa447f96138726c3e030e9c8f6e36acd202430b..9c2d898aaacd3a04a2a57bf5c6eecbe672044dde 100644 (file)
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -300,6 +300,9 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <time.h> header file. */
 #cmakedefine HAVE_TIME_H 1
 
+/* Define to 1 if you have the <unistd.h> header file. */
+#cmakedefine HAVE_UNISTD_H 1
+
 /* Define to 1 if the system has the type `unsigned long long'. */
 #cmakedefine HAVE_UNSIGNED_LONG_LONG 1
 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index fabfdf25384b8d7fd0366154343046ee2628f041..c4813ce66a6941f93ebac86cc1334455eadfa9de 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -62,6 +62,9 @@ if(NOT HAVE_DECL_STRSIGNAL)
   set(SOURCES ${SOURCES} strsignal.c)
 endif(NOT HAVE_DECL_STRSIGNAL)
 
+if(NOT HAVE_DECL_ALARM)
+  set(SOURCES ${SOURCES} alarm.c)
+endif(NOT HAVE_DECL_ALARM)
 
 set(HEADERS libcompat.h)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4cc3747db1c3cc44f8b8782c742a6a9772bacf24..8b126671d69ee9f24b6524bcac09202e6953c67b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,19 +43,15 @@ set(HEADERS
   check_print.h
   check_str.h)
 
-configure_file(check.h.in check.h)
+configure_file(check.h.in check.h @ONLY)
 
 add_library(check STATIC ${SOURCES} ${HEADERS})
 target_link_libraries(check ${LIBM} ${LIBRT} ${SUBUNIT})
 # Enable finding check.h
-if(CMAKE_VERSION VERSION_LESS 2.8.12)
-  include_directories(${CMAKE_CURRENT_BINARY_DIR})
-else()
-  target_include_directories(check
-    PUBLIC
-      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-      $<INSTALL_INTERFACE:include>)
-endif()
+target_include_directories(check
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+    $<INSTALL_INTERFACE:include>)
 
 if(MSVC)
   add_definitions(-DCK_DLL_EXP=_declspec\(dllexport\))

diff --git a/src/check.c b/src/check.c
index c6cd22a0fb5fadb5d0e46b6311dab20e5d2712b1..d89b2a83eb27a7441d36117fb32db83428ff7ba2 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -26,6 +26,10 @@
 #include <stdarg.h>
 #include <math.h>
 
+#if defined(HAVE_FORK) && HAVE_FORK==1
+#include <unistd.h>
+#endif /* HAVE_FORK */
+
 #include "check.h"
 #include "check_error.h"
 #include "check_list.h"

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b3d7ab7e73d6df6499dd52e973a5982dc74e1972..82e3b43948d3ff6c8997c6854d88e47830114a5a 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -38,9 +38,7 @@ if(WIN32)
 endif(WIN32)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_vars.in
-  ${CMAKE_CURRENT_BINARY_DIR}/test_vars)
-
-include(CTest)
+  ${CMAKE_CURRENT_BINARY_DIR}/test_vars @ONLY)
 
 set(CHECK_CHECK_SOURCES
   check_check_exit.c

diff --git a/travis.sh b/travis.sh
index 47a9baf026dbfde969794c35bdff5c3373d50c98..f455a31c7b31f66b6972ad49924ff7085d1e7955 100644 (file)
--- a/travis.sh
+++ b/travis.sh
@@ -30,6 +30,7 @@ if [ -d doc/doxygen ]; then
 fi
 
 if [ "${USE_CMAKE}" = 'YES' ] ; then
+   cmake --version
    cmake . || exit 1
    make || exit 1
    ctest -V || exit 1
@@ -82,6 +83,7 @@ if [ "${PRE_RELEASE_CHECK}" = 'YES' ]; then
    make prereleasecheck || exit 1
    tar xf check-*.tar.gz
    cd check-*
+   cmake --version
    cmake . || exit 1
    make || exit 1
 fi