Correctly locate libxsd.

CMakeLists.txt

@@ -124,6 +124,7 @@ else()
 	find_package(Belr REQUIRED)
 endif()
 find_package(XML2 REQUIRED)
+find_package(LibXsd REQUIRED)
 find_package(Zlib)
 if(ENABLE_TUNNEL)
 	if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)

coreapi/CMakeLists.txt

@@ -158,7 +158,7 @@ set(LIBS
 	${ORTP_LIBRARIES}
 	${XML2_LIBRARIES}
 	${BELR_LIBRARIES}
-	/usr/local/Cellar/xerces-c/3.1.4/lib/libxerces-c.dylib
+	${LIBXSD_LIBRARIES}
 )
 if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 	list(APPEND LIBS "Ws2_32")

src/CMakeLists.txt

@@ -55,7 +55,7 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
 )
 
 set(LINPHONE_CXX_OBJECTS_DEFINITIONS "-DLIBLINPHONE_EXPORTS")
-set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS} /Users/reisbenjamin/xsd-4.0.0-i686-macosx/libxsd /usr/local/Cellar/xerces-c/3.1.4/include)
+set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS} ${LIBXSD_INCLUDE_DIRS})
 
 set(LINPHONE_PRIVATE_HEADER_FILES)
 foreach(header ${LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES})

src/conference/local-conference-event-handler.h

@@ -20,6 +20,7 @@
 #define _LOCAL_CONFERENCE_EVENT_HANDLER_H_
 
 #include <map>
+#include <memory>
 #include <list>
 #include <string>
 
@@ -122,4 +123,4 @@ const LinphoneAddress* LinphonePrivate::Conference::Participant::getAddress() co
   return mAddr;
 }
 
-#endif // ifndef _LOCAL_CONFERENCE_EVENT_HANDLER_H_
\ No newline at end of file
+#endif // ifndef _LOCAL_CONFERENCE_EVENT_HANDLER_H_