From c681332e72b3a10a2ee1baa0fbd66acbedd524be Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 14 Aug 2017 15:41:59 +0200
Subject: [PATCH] Correctly locate libxsd.

---
 CMakeLists.txt                                  | 1 +
 coreapi/CMakeLists.txt                          | 2 +-
 src/CMakeLists.txt                              | 2 +-
 src/conference/local-conference-event-handler.h | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17b86bbaa..2625c0acd 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 905a521d9..8d926a907 100644
--- a/coreapi/CMakeLists.txt
+++ b/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")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f86e48ea2..8ed54e447 100644
--- a/src/CMakeLists.txt
+++ b/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})
diff --git a/src/conference/local-conference-event-handler.h b/src/conference/local-conference-event-handler.h
index 4dd08d1e5..7a803ba84 100644
--- a/src/conference/local-conference-event-handler.h
+++ b/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_