Mercurial > hg > orthanc
diff Resources/CMake/CivetwebConfiguration.cmake @ 3128:972cc98959a3 db-changes
fix build of civetweb for Visual Studio 2008 and LSB
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 16 Jan 2019 12:14:30 +0100 |
parents | ad37c21ec4db |
children | 0c2a8d5e0097 |
line wrap: on
line diff
--- a/Resources/CMake/CivetwebConfiguration.cmake Wed Jan 16 09:53:45 2019 +0100 +++ b/Resources/CMake/CivetwebConfiguration.cmake Wed Jan 16 12:14:30 2019 +0100 @@ -3,8 +3,25 @@ set(CIVETWEB_URL "http://www.orthanc-server.com/downloads/third-party/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()