From 6a4c4e979f5558233e01cff5220bb2ec4619d722 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 30 Apr 2018 14:06:02 +0200 Subject: [PATCH] Fix build with Xcode. --- CMakeLists.txt | 15 ++- coreapi/CMakeLists.txt | 180 +++++------------------------------- src/CMakeLists.txt | 151 +++++++++++++++++++++++++++--- src/xml/conference-info.cpp | 2 + src/xml/conference-info.h | 2 + src/xml/imdn.cpp | 2 + src/xml/imdn.h | 2 + src/xml/is-composing.cpp | 2 + src/xml/is-composing.h | 2 + src/xml/linphone-imdn.cpp | 2 + src/xml/linphone-imdn.h | 2 + src/xml/prologue.txt | 2 + src/xml/resource-lists.cpp | 2 + src/xml/resource-lists.h | 2 + src/xml/xml.cpp | 2 + src/xml/xml.h | 2 + 16 files changed, 201 insertions(+), 171 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5a4cbe6a..18a57418a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,6 +182,19 @@ if(UNIX AND NOT APPLE) check_include_files(libudev.h HAVE_LIBUDEV_H) endif() +if(MSVC AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + find_library(LIBGCC NAMES gcc) + find_library(LIBMINGWEX NAMES mingwex) +endif() + +if(NOT WIN32) + find_package(Iconv QUIET) +endif() +if(ANDROID) + find_package(CpuFeatures REQUIRED) + find_package(Support REQUIRED) +endif() + set(LINPHONE_LDFLAGS "${BELLESIP_LDFLAGS} ${MEDIASTREAMER2_LDFLAGS}") if(BELCARD_FOUND AND APPLE) set(LINPHONE_LDFLAGS "${LINPHONE_LDFLAGS} -stdlib=libc++") @@ -342,8 +355,8 @@ add_subdirectory(java) if(ENABLE_JAVA_WRAPPER) add_subdirectory(wrappers/java) endif() -add_subdirectory(src) add_subdirectory(coreapi) +add_subdirectory(src) add_subdirectory(share) if(ENABLE_CONSOLE_UI) add_subdirectory(console) diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt index 521d866a8..fb380c2a5 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -20,19 +20,6 @@ # ############################################################################ -if(MSVC AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - find_library(LIBGCC NAMES gcc) - find_library(LIBMINGWEX NAMES mingwex) -endif() - -if(NOT WIN32) - find_package(Iconv QUIET) -endif() -if(ANDROID) - find_package(CpuFeatures REQUIRED) - find_package(Support REQUIRED) -endif() - list(APPEND LINPHONE_PRIVATE_HEADER_FILES bellesip_sal/sal_impl.h carddav.h @@ -136,55 +123,7 @@ else() list(APPEND LINPHONE_SOURCE_FILES_C linphone_tunnel_stubs.c) endif() -bc_git_version(liblinphone ${PROJECT_VERSION}) - -add_definitions( - -DUSE_BELLESIP - -DLIBLINPHONE_EXPORTS - -DBCTBX_LOG_DOMAIN="liblinphone" -) - -set(LIBS - ${BCTOOLBOX_CORE_LIBRARIES} - ${BELLESIP_LIBRARIES} - ${MEDIASTREAMER2_LIBRARIES} - ${ORTP_LIBRARIES} - ${XML2_LIBRARIES} - ${BELR_LIBRARIES} - ${LIBXSD_LIBRARIES} -) -if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - list(APPEND LIBS "Ws2_32") -endif() -if(ENABLE_LIME) - list(APPEND LIBS ${BZRTP_LIBRARIES}) -endif() -if(ZLIB_FOUND) - list(APPEND LIBS ${ZLIB_LIBRARIES}) -endif() -if(SOCI_FOUND) - list(APPEND LIBS ${SOCI_LIBRARIES}) -endif() -if(SQLITE3_FOUND) - list(APPEND LIBS ${SQLITE3_LIBRARIES}) -endif() -if(ICONV_FOUND) - list(APPEND LIBS ${ICONV_LIBRARIES}) -endif() -if(ENABLE_TUNNEL) - list(APPEND LIBS ${TUNNEL_LIBRARIES}) -endif() -if(MSVC AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - list(APPEND LIBS ${LIBGCC} ${LIBMINGWEX}) -endif() -if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - list(APPEND LIBS shlwapi) -endif() -if(INTL_FOUND) - list(APPEND LIBS ${INTL_LIBRARIES}) -endif() if(BELCARD_FOUND) - list(APPEND LIBS ${BELCARD_LIBRARIES}) list(APPEND LINPHONE_SOURCE_FILES_CXX vcard.cc) if(NOT MSVC) list(APPEND STRICT_OPTIONS_CXX "-std=c++11") @@ -196,106 +135,37 @@ else() list(APPEND LINPHONE_SOURCE_FILES_C vcard_stubs.c) endif() + +bc_git_version(liblinphone ${PROJECT_VERSION}) + +add_definitions( + -DUSE_BELLESIP + -DLIBLINPHONE_EXPORTS + -DBCTBX_LOG_DOMAIN="liblinphone" +) + set_source_files_properties(${LINPHONE_SOURCE_FILES_C} PROPERTIES LANGUAGE CXX) bc_apply_compile_flags(LINPHONE_SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX) bc_apply_compile_flags(LINPHONE_SOURCE_FILES_CXX STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX) bc_apply_compile_flags(LINPHONE_SOURCE_FILES_OBJC STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC) -if(ENABLE_STATIC) - add_library(linphone-static STATIC ${LINPHONE_HEADER_FILES} ${LINPHONE_PRIVATE_HEADER_FILES} - ${LINPHONE_SOURCE_FILES_C} ${LINPHONE_SOURCE_FILES_CXX} ${LINPHONE_SOURCE_FILES_OBJC} - $ - ) - set_target_properties(linphone-static PROPERTIES OUTPUT_NAME linphone) - add_dependencies(linphone-static liblinphone-git-version) - target_include_directories(linphone-static PUBLIC ${LINPHONE_INCLUDE_DIRS}) - target_link_libraries(linphone-static INTERFACE ${LIBS}) - if(APPLE) - target_link_libraries(linphone-static INTERFACE "-framework Foundation" "-framework AVFoundation") - endif() - install(TARGETS linphone-static EXPORT ${EXPORT_TARGETS_NAME}Targets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) -endif() -if(ENABLE_SHARED) - add_library(linphone SHARED "../share/cpim_grammar" ${LINPHONE_HEADER_FILES} ${LINPHONE_PRIVATE_HEADER_FILES} - ${LINPHONE_SOURCE_FILES_C} ${LINPHONE_SOURCE_FILES_CXX} ${LINPHONE_SOURCE_FILES_OBJC} - $ - ) - if(IOS) - if(IOS) - set(MIN_OS ${LINPHONE_IOS_DEPLOYMENT_TARGET}) - else() - set(MIN_OS ${CMAKE_OSX_DEPLOYMENT_TARGET}) - endif() - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/osx/") - set_target_properties(linphone PROPERTIES - FRAMEWORK TRUE - MACOSX_FRAMEWORK_IDENTIFIER org.linphone.linphone - MACOSX_FRAMEWORK_INFO_PLIST Info.plist.in - PUBLIC_HEADER "${LINPHONE_HEADER_FILES}" - RESOURCE "../share/cpim_grammar" - ) - endif() - if(BELCARD_FOUND) - if(APPLE) - set_target_properties(linphone PROPERTIES LINK_FLAGS "-stdlib=libc++") - endif() - endif() - set_target_properties(linphone PROPERTIES LINKER_LANGUAGE CXX) - if(NOT ANDROID) - # Do not version shared library on Android - set_target_properties(linphone PROPERTIES SOVERSION ${LINPHONE_SO_VERSION}) - endif() - add_dependencies(linphone liblinphone-git-version) - target_include_directories(linphone PUBLIC ${LINPHONE_INCLUDE_DIRS}) - target_link_libraries(linphone PRIVATE ${LIBS}) - if(APPLE) - target_link_libraries(linphone PRIVATE "-framework Foundation" "-framework AVFoundation") - endif() - if(WIN32 AND CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set_target_properties(linphone PROPERTIES PREFIX "lib") - elseif(ANDROID) - target_link_libraries(linphone PUBLIC "log" ${SUPPORT_LIBRARIES} ${CPUFEATURES_LIBRARIES}) - if(ENABLE_JAVA_WRAPPER) - add_dependencies(linphone linphonej) - endif() - endif() - if(MSVC) - if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/linphone.pdb - DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) - endif() - endif() - install(TARGETS linphone EXPORT ${EXPORT_TARGETS_NAME}Targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - FRAMEWORK DESTINATION Frameworks - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +if (ENABLE_STATIC) + add_library(linphone-coreapi-static OBJECT + ${LINPHONE_PRIVATE_HEADER_FILES} ${LINPHONE_SOURCE_FILES_C} ${LINPHONE_SOURCE_FILES_CXX} ${LINPHONE_SOURCE_FILES_OBJC} ) -endif() -if(ICONV_FOUND) - if(APPLE) - # Prevent conflict between the system iconv.h header and the one from macports. - if(ENABLE_STATIC) - target_compile_options(linphone-static PRIVATE "-include" "${ICONV_INCLUDE_DIRS}/iconv.h") - endif() - if(ENABLE_SHARED) - target_compile_options(linphone PRIVATE "-include" "${ICONV_INCLUDE_DIRS}/iconv.h") - endif() - else() - if(ENABLE_STATIC) - target_include_directories(linphone-static PRIVATE ${ICONV_INCLUDE_DIRS}) - endif() - if(ENABLE_SHARED) - target_include_directories(linphone PRIVATE ${ICONV_INCLUDE_DIRS}) - endif() - endif() -endif() + target_include_directories(linphone-coreapi-static SYSTEM PRIVATE ${LINPHONE_INCLUDE_DIRS}) + add_dependencies(linphone-coreapi-static liblinphone-git-version) +endif () + +if (ENABLE_SHARED) + add_library(linphone-coreapi OBJECT + ${LINPHONE_PRIVATE_HEADER_FILES} ${LINPHONE_SOURCE_FILES_C} ${LINPHONE_SOURCE_FILES_CXX} ${LINPHONE_SOURCE_FILES_OBJC} + ) + target_include_directories(linphone-coreapi SYSTEM PRIVATE ${LINPHONE_INCLUDE_DIRS}) + target_compile_options(linphone-coreapi PRIVATE "-fPIC") + add_dependencies(linphone-coreapi liblinphone-git-version) +endif () + add_subdirectory(help) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4208e1479..013e84a7f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,6 +20,50 @@ # ############################################################################ +set(LIBS + ${BCTOOLBOX_CORE_LIBRARIES} + ${BELLESIP_LIBRARIES} + ${MEDIASTREAMER2_LIBRARIES} + ${ORTP_LIBRARIES} + ${XML2_LIBRARIES} + ${BELR_LIBRARIES} + ${LIBXSD_LIBRARIES} +) +if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + list(APPEND LIBS "Ws2_32") +endif() +if(ENABLE_LIME) + list(APPEND LIBS ${BZRTP_LIBRARIES}) +endif() +if(ZLIB_FOUND) + list(APPEND LIBS ${ZLIB_LIBRARIES}) +endif() +if(SOCI_FOUND) + list(APPEND LIBS ${SOCI_LIBRARIES}) +endif() +if(SQLITE3_FOUND) + list(APPEND LIBS ${SQLITE3_LIBRARIES}) +endif() +if(ICONV_FOUND) + list(APPEND LIBS ${ICONV_LIBRARIES}) +endif() +if(ENABLE_TUNNEL) + list(APPEND LIBS ${TUNNEL_LIBRARIES}) +endif() +if(MSVC AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + list(APPEND LIBS ${LIBGCC} ${LIBMINGWEX}) +endif() +if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + list(APPEND LIBS shlwapi) +endif() +if(INTL_FOUND) + list(APPEND LIBS ${INTL_LIBRARIES}) +endif() +if(BELCARD_FOUND) + list(APPEND LIBS ${BELCARD_LIBRARIES}) +endif() + + set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES address/address-p.h address/address.h @@ -330,21 +374,98 @@ set(LINPHONE_PRIVATE_HEADER_FILES ${LINPHONE_PRIVATE_HEADER_FILES} PARENT_SCOPE) bc_apply_compile_flags(LINPHONE_CXX_OBJECTS_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX) bc_apply_compile_flags(LINPHONE_OBJC_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC) -if (ENABLE_STATIC) - add_library( - linphone-cxx-objects-static OBJECT - ${LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES} ${LINPHONE_CXX_OBJECTS_SOURCE_FILES} ${LINPHONE_OBJC_SOURCE_FILES} - ) - target_compile_definitions(linphone-cxx-objects-static PRIVATE ${LINPHONE_CXX_OBJECTS_DEFINITIONS}) - target_include_directories(linphone-cxx-objects-static SYSTEM PRIVATE ${LINPHONE_CXX_OBJECTS_INCLUDE_DIRS} ${LINPHONE_INCLUDE_DIRS}) -endif () -if (ENABLE_SHARED) - add_library( - linphone-cxx-objects OBJECT +if(ENABLE_STATIC) + add_library(linphone-static STATIC ${LINPHONE_HEADER_FILES} ${LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES} ${LINPHONE_CXX_OBJECTS_SOURCE_FILES} ${LINPHONE_OBJC_SOURCE_FILES} + $ ) - target_compile_definitions(linphone-cxx-objects PRIVATE ${LINPHONE_CXX_OBJECTS_DEFINITIONS}) - target_include_directories(linphone-cxx-objects SYSTEM PRIVATE ${LINPHONE_CXX_OBJECTS_INCLUDE_DIRS} ${LINPHONE_INCLUDE_DIRS}) - target_compile_options(linphone-cxx-objects PRIVATE "-fPIC") -endif () + set_target_properties(linphone-static PROPERTIES OUTPUT_NAME linphone) + target_include_directories(linphone-static PUBLIC ${LINPHONE_INCLUDE_DIRS}) + target_link_libraries(linphone-static INTERFACE ${LIBS}) + if(APPLE) + target_link_libraries(linphone-static INTERFACE "-framework Foundation" "-framework AVFoundation") + endif() + install(TARGETS linphone-static EXPORT ${EXPORT_TARGETS_NAME}Targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) +endif() +if(ENABLE_SHARED) + add_library(linphone SHARED "../share/cpim_grammar" ${LINPHONE_HEADER_FILES} + ${LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES} ${LINPHONE_CXX_OBJECTS_SOURCE_FILES} ${LINPHONE_OBJC_SOURCE_FILES} + $ + ) + if(IOS) + if(IOS) + set(MIN_OS ${LINPHONE_IOS_DEPLOYMENT_TARGET}) + else() + set(MIN_OS ${CMAKE_OSX_DEPLOYMENT_TARGET}) + endif() + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/osx/") + set_target_properties(linphone PROPERTIES + FRAMEWORK TRUE + MACOSX_FRAMEWORK_IDENTIFIER org.linphone.linphone + MACOSX_FRAMEWORK_INFO_PLIST Info.plist.in + PUBLIC_HEADER "${LINPHONE_HEADER_FILES}" + RESOURCE "../share/cpim_grammar" + ) + endif() + if(BELCARD_FOUND) + if(APPLE) + set_target_properties(linphone PROPERTIES LINK_FLAGS "-stdlib=libc++") + endif() + endif() + + set_target_properties(linphone PROPERTIES LINKER_LANGUAGE CXX) + if(NOT ANDROID) + # Do not version shared library on Android + set_target_properties(linphone PROPERTIES SOVERSION ${LINPHONE_SO_VERSION}) + endif() + target_include_directories(linphone PUBLIC ${LINPHONE_INCLUDE_DIRS}) + target_link_libraries(linphone PRIVATE ${LIBS}) + if(APPLE) + target_link_libraries(linphone PRIVATE "-framework Foundation" "-framework AVFoundation") + endif() + if(WIN32 AND CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set_target_properties(linphone PROPERTIES PREFIX "lib") + elseif(ANDROID) + target_link_libraries(linphone PUBLIC "log" ${SUPPORT_LIBRARIES} ${CPUFEATURES_LIBRARIES}) + if(ENABLE_JAVA_WRAPPER) + add_dependencies(linphone linphonej) + endif() + endif() + if(MSVC) + if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/linphone.pdb + DESTINATION ${CMAKE_INSTALL_BINDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) + endif() + endif() + install(TARGETS linphone EXPORT ${EXPORT_TARGETS_NAME}Targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + FRAMEWORK DESTINATION Frameworks + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) +endif() +if(ICONV_FOUND) + if(APPLE) + # Prevent conflict between the system iconv.h header and the one from macports. + if(ENABLE_STATIC) + target_compile_options(linphone-static PRIVATE "-include" "${ICONV_INCLUDE_DIRS}/iconv.h") + endif() + if(ENABLE_SHARED) + target_compile_options(linphone PRIVATE "-include" "${ICONV_INCLUDE_DIRS}/iconv.h") + endif() + else() + if(ENABLE_STATIC) + target_include_directories(linphone-static PRIVATE ${ICONV_INCLUDE_DIRS}) + endif() + if(ENABLE_SHARED) + target_include_directories(linphone PRIVATE ${ICONV_INCLUDE_DIRS}) + endif() + endif() +endif() diff --git a/src/xml/conference-info.cpp b/src/xml/conference-info.cpp index fc2f8aac3..f887efce2 100644 --- a/src/xml/conference-info.cpp +++ b/src/xml/conference-info.cpp @@ -36,6 +36,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/conference-info.h b/src/xml/conference-info.h index cc7c48a96..9925b5539 100644 --- a/src/xml/conference-info.h +++ b/src/xml/conference-info.h @@ -51,6 +51,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/imdn.cpp b/src/xml/imdn.cpp index d180b9078..ade5553fb 100644 --- a/src/xml/imdn.cpp +++ b/src/xml/imdn.cpp @@ -36,6 +36,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/imdn.h b/src/xml/imdn.h index 687f80533..81c5a9ed3 100644 --- a/src/xml/imdn.h +++ b/src/xml/imdn.h @@ -51,6 +51,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/is-composing.cpp b/src/xml/is-composing.cpp index 24002401b..0f6ab0e78 100644 --- a/src/xml/is-composing.cpp +++ b/src/xml/is-composing.cpp @@ -36,6 +36,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/is-composing.h b/src/xml/is-composing.h index 1d7025245..b6ca96359 100644 --- a/src/xml/is-composing.h +++ b/src/xml/is-composing.h @@ -51,6 +51,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/linphone-imdn.cpp b/src/xml/linphone-imdn.cpp index d54b05414..e1e4a7934 100644 --- a/src/xml/linphone-imdn.cpp +++ b/src/xml/linphone-imdn.cpp @@ -36,6 +36,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/linphone-imdn.h b/src/xml/linphone-imdn.h index 42e1327a6..940553cfc 100644 --- a/src/xml/linphone-imdn.h +++ b/src/xml/linphone-imdn.h @@ -51,6 +51,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/prologue.txt b/src/xml/prologue.txt index 23e94d03a..410500a6d 100644 --- a/src/xml/prologue.txt +++ b/src/xml/prologue.txt @@ -1,6 +1,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/resource-lists.cpp b/src/xml/resource-lists.cpp index 79f90d384..fffeacbd8 100644 --- a/src/xml/resource-lists.cpp +++ b/src/xml/resource-lists.cpp @@ -36,6 +36,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/resource-lists.h b/src/xml/resource-lists.h index 4494881c4..ecb0de126 100644 --- a/src/xml/resource-lists.h +++ b/src/xml/resource-lists.h @@ -51,6 +51,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp index f052e7f5a..2d76282c4 100644 --- a/src/xml/xml.cpp +++ b/src/xml/xml.cpp @@ -36,6 +36,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push diff --git a/src/xml/xml.h b/src/xml/xml.h index 681dc279d..14790ba3f 100644 --- a/src/xml/xml.h +++ b/src/xml/xml.h @@ -51,6 +51,8 @@ #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" + #pragma GCC diagnostic ignored "-Wsign-conversion" + #pragma GCC diagnostic ignored "-Wconversion" #endif #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic push