Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
37b9abe7
Commit
37b9abe7
authored
Aug 28, 2017
by
Benjamin REIS
Browse files
libxsd temporary optionnal
parent
913486ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
37b9abe7
...
...
@@ -133,7 +133,7 @@ else()
find_package
(
Belr REQUIRED
)
endif
()
find_package
(
XML2 REQUIRED
)
find_package
(
LibXsd
REQUIRED
)
find_package
(
LibXsd
)
find_package
(
Soci
)
find_package
(
Zlib
)
if
(
ENABLE_TUNNEL
)
...
...
coreapi/CMakeLists.txt
View file @
37b9abe7
...
...
@@ -158,7 +158,6 @@ set(LIBS
${
ORTP_LIBRARIES
}
${
XML2_LIBRARIES
}
${
BELR_LIBRARIES
}
${
LIBXSD_LIBRARIES
}
)
if
(
WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL
"WindowsStore"
)
list
(
APPEND LIBS
"Ws2_32"
)
...
...
@@ -169,6 +168,9 @@ endif()
if
(
ZLIB_FOUND
)
list
(
APPEND LIBS
${
ZLIB_LIBRARIES
}
)
endif
()
if
(
LIBXSD_FOUND
)
list
(
APPEND LIBS
${
LIBXSD_LIBRARIES
}
)
endif
()
if
(
SOCI_FOUND
)
list
(
APPEND LIBS
${
SOCI_LIBRARIES
}
)
endif
()
...
...
src/CMakeLists.txt
View file @
37b9abe7
...
...
@@ -89,14 +89,19 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
xml/conference-info.cpp
xml/xml.cpp
)
if
(
LIBXSD_FOUND
)
ADD_XSD_WRAPPERS
(
xml/xml
"XML XSD - xml.xsd"
)
ADD_XSD_WRAPPERS
(
xml/conference-info
"Conference info XSD - conference-info.xsd"
)
endif
()
ADD_XSD_WRAPPERS
(
xml/xml
"XML XSD - xml.xsd"
)
ADD_XSD_WRAPPERS
(
xml/conference-info
"Conference info XSD - conference-info.xsd"
)
set
(
LINPHONE_CXX_OBJECTS_INCLUDE_DIRS
${
BELR_INCLUDE_DIRS
}
${
LIBXSD_INCLUDE_DIRS
}
)
set
(
LINPHONE_CXX_OBJECTS_INCLUDE_DIRS
${
BELR_INCLUDE_DIRS
}
)
set
(
LINPHONE_CXX_OBJECTS_DEFINITIONS
"-DLIBLINPHONE_EXPORTS"
)
set
(
LINPHONE_CXX_OBJECTS_INCLUDE_DIRS
${
BELR_INCLUDE_DIRS
}
)
if
(
LIBXSD_FOUND
)
list
(
APPEND LINPHONE_CXX_OBJECTS_INCLUDE_DIRS
${
LIBXSD_INCLUDE_DIRS
}
)
endif
()
if
(
SOCI_FOUND
)
list
(
APPEND LINPHONE_CXX_OBJECTS_INCLUDE_DIRS
${
SOCI_INCLUDE_DIRS
}
${
SOCI_MYSQL_INCLUDES
}
)
add_definitions
(
-DSOCI_ENABLED
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment