Mercurial > hg > orthanc

comparison Resources/CMake/CivetwebConfiguration.cmake @ 3801:9fe1d64a748c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to civetweb 1.12, error reporting if OpenSSL failure
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 02 Apr 2020 11:24:47 +0200
parents 9c091747483a
children 552703b37114
comparison
equal deleted inserted replaced
3800:38b0f51781aa 3801:9fe1d64a748c
1 if (STATIC_BUILD OR NOT USE_SYSTEM_CIVETWEB) 1 if (STATIC_BUILD OR NOT USE_SYSTEM_CIVETWEB)
2 set(CIVETWEB_SOURCES_DIR ${CMAKE_BINARY_DIR}/civetweb-1.11) 2 set(CIVETWEB_SOURCES_DIR ${CMAKE_BINARY_DIR}/civetweb-1.12)
3 set(CIVETWEB_URL "http://orthanc.osimis.io/ThirdPartyDownloads/civetweb-1.11.tar.gz") 3 set(CIVETWEB_URL "http://orthanc.osimis.io/ThirdPartyDownloads/civetweb-1.12.tar.gz")
4 set(CIVETWEB_MD5 "b6d2175650a27924bccb747cbe084cd4") 4 set(CIVETWEB_MD5 "2a2a82c19b10b4ac178952f227f19d70")
5 5
6 if (IS_DIRECTORY "${CIVETWEB_SOURCES_DIR}") 6 if (IS_DIRECTORY "${CIVETWEB_SOURCES_DIR}")
7 set(FirstRun OFF) 7 set(FirstRun OFF)
8 else() 8 else()
9 set(FirstRun ON) 9 set(FirstRun ON)
11 11
12 DownloadPackage(${CIVETWEB_MD5} ${CIVETWEB_URL} "${CIVETWEB_SOURCES_DIR}") 12 DownloadPackage(${CIVETWEB_MD5} ${CIVETWEB_URL} "${CIVETWEB_SOURCES_DIR}")
13 13
14 execute_process( 14 execute_process(
15 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 15 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
16 ${ORTHANC_ROOT}/Resources/Patches/civetweb-1.11.patch 16 ${ORTHANC_ROOT}/Resources/Patches/civetweb-1.12.patch
17 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 17 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
18 RESULT_VARIABLE Failure 18 RESULT_VARIABLE Failure
19 ) 19 )
20 20
21 if (FirstRun AND Failure) 21 if (FirstRun AND Failure)