Commit a225ee2e authored by François Grisez's avatar François Grisez

Fix build with CMake 3.15 and GCC 9.1

parent 9af2ef16
Pipeline #7423 failed with stages
in 33 minutes and 34 seconds
Subproject commit e0758a14db11d2045593d947e10e3b3cacaada36
Subproject commit a0da0e4b968488309cf4d92aca963352b7374b7d
......@@ -184,6 +184,22 @@ if(ENABLE_PRESENCE)
message(FATAL_ERROR "Presence asked but XSD not enabled! Please enable it first.")
endif()
add_definitions(-DBELLE_SIP_USE_STL ${BELLE_SIP_CFLAGS})
set(XML_SOURCES
xml/data-model.cc
xml/data-model.hh
xml/pidf+xml.cc
xml/pidf+xml.hh
xml/pidf-oma-pres.cc
xml/pidf-oma-pres.hh
xml/resource-lists.cc
xml/resource-lists.hh
xml/rlmi+xml.cc
xml/rlmi+xml.hh
xml/rpid.cc
xml/rpid.hh
xml/xml.cc
xml/xml.hh
)
list(APPEND FLEXISIP_LIBS ${XERCES_LIBS})
list(APPEND FLEXISIP_INCLUDES presence)
list(APPEND FLEXISIP_SOURCES
......@@ -207,20 +223,7 @@ if(ENABLE_PRESENCE)
presence/presentity-presenceinformation.hh
presence/subscription.cc
presence/subscription.hh
xml/data-model.cc
xml/data-model.hh
xml/pidf+xml.cc
xml/pidf+xml.hh
xml/pidf-oma-pres.cc
xml/pidf-oma-pres.hh
xml/resource-lists.cc
xml/resource-lists.hh
xml/rlmi+xml.cc
xml/rlmi+xml.hh
xml/rpid.cc
xml/rpid.hh
xml/xml.cc
xml/xml.hh
${XML_SOURCES}
)
if(ENABLE_SOCI)
list(APPEND FLEXISIP_SOURCES
......@@ -242,14 +245,6 @@ if(ENABLE_CONFERENCE)
conference/registration-subscription.hh
conference/participant-registration-subscription-handler.cc
conference/participant-registration-subscription-handler.hh
# conference/participant-capabilities-check.cc
# conference/participant-capabilities-check.hh
# conference/participant-devices-search.cc
# conference/participant-devices-search.hh
# conference/participant-registration-subscription.cc
# conference/participant-registration-subscription.hh
)
endif()
......@@ -291,10 +286,13 @@ message(STATUS "Flexisip DEPENDENCIES : ${FLEXISIP_DEPENDENCIES}")
bc_apply_compile_flags(FLEXISIP_SOURCES CPP_BUILD_FLAGS CXX_BUILD_FLAGS)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 6.0.0 OR ${CMAKE_CXX_COMPILER_VERSION} VERSION_EQUAL 6.0.0)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0.0)
set_source_files_properties(cJSON.c PROPERTIES COMPILE_FLAGS "-Wno-error=misleading-indentation")
endif()
set_source_files_properties(stun/stun.c PROPERTIES COMPILE_FLAGS "-Wno-error=sign-compare")
if (ENABLE_PRESENCE AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.1.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 9.1.0))
set_source_files_properties(${XML_SOURCES} PROPERTIES COMPILE_FLAGS "-Wno-error=deprecated-copy")
endif()
endif()
add_library(flexisip SHARED ${FLEXISIP_SOURCES})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment