Mercurial > hg > orthanc

comparison Resources/CMake/CivetwebConfiguration.cmake @ 3128:972cc98959a3 db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3127:e678a2b1a25b 3128:972cc98959a3
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.11)
3 set(CIVETWEB_URL "http://www.orthanc-server.com/downloads/third-party/civetweb-1.11.tar.gz") 3 set(CIVETWEB_URL "http://www.orthanc-server.com/downloads/third-party/civetweb-1.11.tar.gz")
4 set(CIVETWEB_MD5 "b6d2175650a27924bccb747cbe084cd4") 4 set(CIVETWEB_MD5 "b6d2175650a27924bccb747cbe084cd4")
5 5
6 if (IS_DIRECTORY "${CIVETWEB_SOURCES_DIR}")
7 set(FirstRun OFF)
8 else()
9 set(FirstRun ON)
10 endif()
11
6 DownloadPackage(${CIVETWEB_MD5} ${CIVETWEB_URL} "${CIVETWEB_SOURCES_DIR}") 12 DownloadPackage(${CIVETWEB_MD5} ${CIVETWEB_URL} "${CIVETWEB_SOURCES_DIR}")
7 13
14 execute_process(
15 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
16 ${ORTHANC_ROOT}/Resources/Patches/civetweb-1.11.patch
17 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
18 RESULT_VARIABLE Failure
19 )
20
21 if (FirstRun AND Failure)
22 message(FATAL_ERROR "Error while patching a file")
23 endif()
24
8 include_directories( 25 include_directories(
9 ${CIVETWEB_SOURCES_DIR}/include 26 ${CIVETWEB_SOURCES_DIR}/include
10 ) 27 )
11 28
12 set(CIVETWEB_SOURCES 29 set(CIVETWEB_SOURCES
13 ${CIVETWEB_SOURCES_DIR}/src/civetweb.c 30 ${CIVETWEB_SOURCES_DIR}/src/civetweb.c
14 ) 31 )
15
16 32
17 if (ENABLE_SSL) 33 if (ENABLE_SSL)
18 add_definitions( 34 add_definitions(
19 -DNO_SSL_DL=1 35 -DNO_SSL_DL=1
20 ) 36 )
25 41
26 else() 42 else()
27 add_definitions( 43 add_definitions(
28 -DNO_SSL=1 # Remove SSL support from civetweb 44 -DNO_SSL=1 # Remove SSL support from civetweb
29 ) 45 )
30 endif()
31
32
33 if (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND
34 CMAKE_COMPILER_IS_GNUCXX)
35 # This is a patch for MinGW64
36 add_definitions(-D_TIMESPEC_DEFINED=1)
37 endif() 46 endif()
38 47
39 source_group(ThirdParty\\Civetweb REGULAR_EXPRESSION ${CIVETWEB_SOURCES_DIR}/.*) 48 source_group(ThirdParty\\Civetweb REGULAR_EXPRESSION ${CIVETWEB_SOURCES_DIR}/.*)
40 49
41 else() 50 else()