cmake/features.cmake

@@ -41,7 +41,7 @@ if(NOT HAVE_FORMAT)
 endif()
 
 set(EXOSIP_LIBS eXosip2 osip2 osipparser2)
-if(NOT VENDOR_EXOSIP AND NOT WIN32 AND NOT BUILD_STATIC AND NOT BUILD_VENDOR AND NOT BUILD_DRIVER)
+if(NOT VENDOR_EXOSIP AND NOT BUILD_STATIC AND NOT BUILD_VENDOR AND NOT BUILD_DRIVER)
     pkg_check_modules(OSIP2 libosip2>=5.2.1)
 endif()
 
@@ -50,12 +50,10 @@ if(OSIP2_FOUND)
     link_directories(${OSIP2_LIBRARY_DIRS})
 else()
     include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/vendor/libosip2/include" "${CMAKE_CURRENT_SOURCE_DIR}/vendor/libeXosip2/include")
-    if(NOT WIN32)
-        pkg_check_modules(CARES libcares>=1.13.0 REQUIRED)
-        include_directories(${CARES_INCLUDE_DIRECTORIES})
-        link_directories(${CARES_LIBRARY_DIRS})
-        list(APPEND EXOSIP_LIBS ${CARES_LIBRARIES})
-    endif()
+    pkg_check_modules(CARES libcares>=1.13.0 REQUIRED)
+    include_directories(${CARES_INCLUDE_DIRECTORIES})
+    link_directories(${CARES_LIBRARY_DIRS})
+    list(APPEND EXOSIP_LIBS ${CARES_LIBRARIES})
 endif()
 
 if(CMAKE_BUILD_TYPE MATCHES "Debug")

vendor/libeXosip2/CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.1)
-Project(libeXosip2 VERSION 5.2.0 LANGUAGES C)
+Project(libeXosip2 VERSION 5.2.1 LANGUAGES C)
 
 if(NOT BUILD_STATIC)
     add_definitions(-fPIC)
 endif()
 
-add_definitions(-DOSIP_MT -DSRV_RECORD)
+add_definitions(-DOSIP_MT -DSRV_RECORD -DHAVE_ARES_H)
 if(WIN32)
     add_definitions(-DWIN32 -DHAVE_WINDOWS_H)
 else()
@@ -13,10 +13,6 @@ else()
     add_definitions(-DHAVE_SYS_SELECT_H)
 endif()
 
-if(CARES_FOUND)
-    add_definitions(-DHAVE_ARES_H)
-endif()
-
 file(GLOB eXosip2_src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.c)
 file(GLOB eXosip2_inc ${CMAKE_CURRENT_SOURCE_DIR}/include/eXosip2/*.h)
 

vendor/libosip2/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-Project(libosip2 VERSION 5.2.0 LANGUAGES C)
+Project(libosip2 VERSION 5.2.1 LANGUAGES C)
 
 if(NOT BUILD_STATIC)
     add_definitions(-fPIC)

vendor/libosip2/src/test/res/sip-malformed18

@@ -3,6 +3,6 @@ SIP/ 400
 mime-version:'
 Content-Type:multipart/0;boundary="
 
---ng:! 
+--ng:! 
 Content-Type:boundary="
 ----