comparison Resources/CMake/LibCurlConfiguration.cmake @ 1531:31b3a540f508

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 12 Aug 2015 14:44:31 +0200
parents 766a42aac55d
children b5eb5210af91
comparison
equal deleted inserted replaced
1530:766a42aac55d 1531:31b3a540f508
40 -DUSE_OPENSSL=1 40 -DUSE_OPENSSL=1
41 -DUSE_SSLEAY=1 41 -DUSE_SSLEAY=1
42 ) 42 )
43 endif() 43 endif()
44 44
45 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR 45 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
46 set_property(
47 SOURCE ${CURL_SOURCES}
48 PROPERTY COMPILE_DEFINITIONS "HAVE_BOOL_T"
49 )
50
51 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
46 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR 52 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
47 ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR 53 ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
48 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") 54 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
49 if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") 55 if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
50 SET(TMP_OS "x86_64") 56 SET(TMP_OS "x86_64")
52 SET(TMP_OS "x86") 58 SET(TMP_OS "x86")
53 endif() 59 endif()
54 60
55 set_property( 61 set_property(
56 SOURCE ${CURL_SOURCES} 62 SOURCE ${CURL_SOURCES}
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;HAVE_BOOL_T;OS=\"${TMP_OS}\"" 63 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}\""
58 ) 64 )
59 65
60 if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") 66 if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
61 add_definitions( 67 add_definitions(
62 -DRECV_TYPE_ARG1=int 68 -DRECV_TYPE_ARG1=int