mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-21 21:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correctly locate libxsd.

Browse source
This commit is contained in:
Ghislain MARY 2017-08-14 15:41:59 +02:00
parent e1fb16defa
commit c681332e72
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -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)

2
coreapi/CMakeLists.txt
View file

@ -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")

2
src/CMakeLists.txt
View file

@ -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})

3
src/conference/local-conference-event-handler.h
View file

@ -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_
#endif // ifndef _LOCAL_CONFERENCE_EVENT_HANDLER_H_