Mercurial > hg > orthanc

comparison Resources/CMake/LibCurlConfiguration.cmake @ 1529:4c1dbfddabd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix windows build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 12 Aug 2015 14:25:17 +0200
parents 7b58e0048874
children 766a42aac55d
comparison
equal deleted inserted replaced
1528:4d0e669ade83 1529:4c1dbfddabd4
5 "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.44.0.tar.gz" 5 "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.44.0.tar.gz"
6 "${CURL_SOURCES_DIR}") 6 "${CURL_SOURCES_DIR}")
7 7
8 include_directories( 8 include_directories(
9 ${CURL_SOURCES_DIR}/include 9 ${CURL_SOURCES_DIR}/include
10 ${CURL_SOURCES_DIR}/lib
10 ) 11 )
11 12
12 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES) 13 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES)
13 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES) 14 AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES)
14 source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*) 15 source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*)
54 set_property( 55 set_property(
55 SOURCE ${CURL_SOURCES} 56 SOURCE ${CURL_SOURCES}
56 PROPERTY COMPILE_DEFINITIONS "HAVE_TIME_H;HAVE_STRUCT_TIMEVAL;HAVE_SYS_STAT_H;HAVE_SOCKET;HAVE_STRUCT_SOCKADDR_STORAGE;HAVE_SYS_SOCKET_H;HAVE_SOCKET;HAVE_SYS_SOCKET_H;HAVE_NETINET_IN_H;HAVE_NETDB_H;HAVE_FCNTL_O_NONBLOCK;HAVE_FCNTL_H;HAVE_SELECT;HAVE_ERRNO_H;HAVE_SEND;HAVE_RECV;HAVE_LONGLONG;OS=\"${TMP_OS}\"" 57 PROPERTY COMPILE_DEFINITIONS "HAVE_TIME_H;HAVE_STRUCT_TIMEVAL;HAVE_SYS_STAT_H;HAVE_SOCKET;HAVE_STRUCT_SOCKADDR_STORAGE;HAVE_SYS_SOCKET_H;HAVE_SOCKET;HAVE_SYS_SOCKET_H;HAVE_NETINET_IN_H;HAVE_NETDB_H;HAVE_FCNTL_O_NONBLOCK;HAVE_FCNTL_H;HAVE_SELECT;HAVE_ERRNO_H;HAVE_SEND;HAVE_RECV;HAVE_LONGLONG;OS=\"${TMP_OS}\""
57 ) 58 )
58 59
59 if (MSVC)
60 set_property(SOURCE ${CURL_SOURCES} PROPERTY COMPILE_FLAGS "/I${CURL_SOURCES_DIR}/lib")
61 else()
62 set_property(SOURCE ${CURL_SOURCES} PROPERTY COMPILE_FLAGS "-I${CURL_SOURCES_DIR}/lib")
63 endif()
64
65 if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") 60 if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
66 add_definitions( 61 add_definitions(
67 -DRECV_TYPE_ARG1=int 62 -DRECV_TYPE_ARG1=int
68 -DRECV_TYPE_ARG2=void* 63 -DRECV_TYPE_ARG2=void*
69 -DRECV_TYPE_ARG3=size_t 64 -DRECV_TYPE_ARG3=size_t