|
@@ -7,15 +7,23 @@ endif()
|
|
|
|
|
|
# We use the check unit testing framework for our C unit tests
|
|
# We use the check unit testing framework for our C unit tests
|
|
include(ExternalProject)
|
|
include(ExternalProject)
|
|
-#if(NOT WIN32)
|
|
|
|
-# # Apply the patch to check to fix CMake building on OS X
|
|
|
|
-# set(CHECK_PATCH_COMMAND patch
|
|
|
|
-# ${CIVETWEB_THIRD_PARTY_DIR}/src/check-unit-test-framework/CMakeLists.txt
|
|
|
|
-# ${CMAKE_SOURCE_DIR}/cmake/check/c82fe8888aacfe784476112edd3878256d2e30bc.patch
|
|
|
|
-# )
|
|
|
|
-#else()
|
|
|
|
-# set(CHECK_PATCH_COMMAND "")
|
|
|
|
-#endif()
|
|
|
|
|
|
+if(NOT WIN32)
|
|
|
|
+ # Apply the patch to check to fix CMake building on OS X
|
|
|
|
+ set(CHECK_PATCH_COMMAND patch
|
|
|
|
+ ${CIVETWEB_THIRD_PARTY_DIR}/src/check-unit-test-framework/src/check_run.c
|
|
|
|
+ ${CMAKE_SOURCE_DIR}/cmake/check/check_run.patch
|
|
|
|
+ )
|
|
|
|
+else()
|
|
|
|
+ set(CHECK_PATCH_COMMAND "")
|
|
|
|
+endif()
|
|
|
|
+
|
|
|
|
+IF (DEFINED ENV{CHECK_URL})
|
|
|
|
+SET (CHECK_URL $ENV{CHECK_URL})
|
|
|
|
+ELSE()
|
|
|
|
+SET (CHECK_URL "https://github.com/civetweb/check/archive/master.zip")
|
|
|
|
+ENDIF()
|
|
|
|
+
|
|
|
|
+
|
|
ExternalProject_Add(check-unit-test-framework
|
|
ExternalProject_Add(check-unit-test-framework
|
|
DEPENDS civetweb-c-library
|
|
DEPENDS civetweb-c-library
|
|
|
|
|
|
@@ -25,9 +33,9 @@ ExternalProject_Add(check-unit-test-framework
|
|
# URL_MD5 ${CIVETWEB_CHECK_MD5_HASH}
|
|
# URL_MD5 ${CIVETWEB_CHECK_MD5_HASH}
|
|
|
|
|
|
## Use a civetweb specific patched version
|
|
## Use a civetweb specific patched version
|
|
-URL "https://github.com/civetweb/check/archive/master.zip"
|
|
|
|
|
|
+
|
|
|
|
+URL ${CHECK_URL}
|
|
DOWNLOAD_NAME "master.zip"
|
|
DOWNLOAD_NAME "master.zip"
|
|
-# <Edit this file to flush AppVeyor build cache and force reloading check>
|
|
|
|
|
|
|
|
PREFIX "${CIVETWEB_THIRD_PARTY_DIR}"
|
|
PREFIX "${CIVETWEB_THIRD_PARTY_DIR}"
|
|
BUILD_IN_SOURCE 1
|
|
BUILD_IN_SOURCE 1
|
|
@@ -248,3 +256,4 @@ if (${CMAKE_BUILD_TYPE} MATCHES "[Cc]overage")
|
|
" --coverage flag: ${C_FLAG_COVERAGE_MESSAGE}")
|
|
" --coverage flag: ${C_FLAG_COVERAGE_MESSAGE}")
|
|
endif()
|
|
endif()
|
|
endif()
|
|
endif()
|
|
|
|
+
|