Mercurial > hg > orthanc
diff Resources/CMake/CivetwebConfiguration.cmake @ 3160:fc9a4a2dad63
merge
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Thu, 24 Jan 2019 10:55:19 +0100 |
parents | 0c2a8d5e0097 |
children | 6d558598d713 |
line wrap: on
line diff
--- a/Resources/CMake/CivetwebConfiguration.cmake Thu Jan 24 10:54:47 2019 +0100 +++ b/Resources/CMake/CivetwebConfiguration.cmake Thu Jan 24 10:55:19 2019 +0100 @@ -1,10 +1,27 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_CIVETWEB) set(CIVETWEB_SOURCES_DIR ${CMAKE_BINARY_DIR}/civetweb-1.11) - set(CIVETWEB_URL "http://www.orthanc-server.com/downloads/third-party/civetweb-1.11.tar.gz") + set(CIVETWEB_URL "http://orthanc.osimis.io/ThirdPartyDownloads/civetweb-1.11.tar.gz") set(CIVETWEB_MD5 "b6d2175650a27924bccb747cbe084cd4") + if (IS_DIRECTORY "${CIVETWEB_SOURCES_DIR}") + set(FirstRun OFF) + else() + set(FirstRun ON) + endif() + DownloadPackage(${CIVETWEB_MD5} ${CIVETWEB_URL} "${CIVETWEB_SOURCES_DIR}") + execute_process( + COMMAND ${PATCH_EXECUTABLE} -p0 -N -i + ${ORTHANC_ROOT}/Resources/Patches/civetweb-1.11.patch + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + RESULT_VARIABLE Failure + ) + + if (FirstRun AND Failure) + message(FATAL_ERROR "Error while patching a file") + endif() + include_directories( ${CIVETWEB_SOURCES_DIR}/include ) @@ -13,7 +30,6 @@ ${CIVETWEB_SOURCES_DIR}/src/civetweb.c ) - if (ENABLE_SSL) add_definitions( -DNO_SSL_DL=1 @@ -29,13 +45,6 @@ ) endif() - - if (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND - CMAKE_COMPILER_IS_GNUCXX) - # This is a patch for MinGW64 - add_definitions(-D_TIMESPEC_DEFINED=1) - endif() - source_group(ThirdParty\\Civetweb REGULAR_EXPRESSION ${CIVETWEB_SOURCES_DIR}/.*) else()