Advertisement
Guest User

Remove jdns

a guest
May 28th, 2021
68
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.39 KB | None | 0 0
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index a389942..12acf3b 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -46,12 +46,10 @@ set( CMAKE_MODULE_PATH
  6.      )
  7.  
  8.  set( DEFAULT_BUNDLED_QCA OFF )
  9. -if (APPLE)
  10. +if (APPLE OR MSVC)
  11.      set( DEFAULT_BUNDLED_QCA ON )
  12.  endif()
  13.  
  14. -option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
  15. -option( SEPARATE_QJDNS "Build qjdns with iris library" OFF )
  16.  option( JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON )
  17.  option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA})
  18.  option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
  19. @@ -72,11 +70,6 @@ if(Qt5Core_FOUND)
  20.      endif()
  21.  endif()
  22.  
  23. -if(USE_QJDNS)
  24. -    message(WARNING "USE_QJDNS flag is enabled with Qt5. If you have problems with connection please disable this flag")
  25. -    add_definitions(-DNEED_JDNS)
  26. -endif()
  27. -
  28.  if(BUNDLED_QCA)
  29.      message(STATUS "QCA: using bundled")
  30.      set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
  31. @@ -165,18 +158,6 @@ if(JINGLE_SCTP)
  32.      include(IrisSCTP)
  33.  endif()
  34.  
  35. -if(NOT USE_QJDNS AND SEPARATE_QJDNS)
  36. -    message(FATAL_ERROR "SEPARATE_QJDNS flag enabled, but USE_QJDNS flag disabled.\nPlease enable flag USE_QJDNS or disable both flags")
  37. -endif()
  38. -
  39. -if(USE_QJDNS AND (NOT SEPARATE_QJDNS))
  40. -    include(src/jdns.cmake)
  41. -elseif(USE_QJDNS)
  42. -    set(QJDns_SUFFIX -qt5)
  43. -    find_package(QJDns REQUIRED)
  44. -    set(QJDns_LIBRARY ${QJDns_LIBRARY} PARENT_SCOPE)
  45. -    include_directories( ${QJDns_INCLUDE_DIR} )
  46. -endif()
  47.  
  48.  if (NOT BUNDLED_QCA)
  49.      find_package(B2 QUIET)
  50. diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
  51. index 0a5b049..d9a2889 100644
  52. --- a/src/irisnet/CMakeLists.txt
  53. +++ b/src/irisnet/CMakeLists.txt
  54. @@ -38,6 +38,7 @@ set(SOURCES
  55.      corelib/netinterface.cpp
  56.      corelib/netnames.cpp
  57.      corelib/objectsession.cpp
  58. +    corelib/netinterface_qtname.cpp
  59.      corelib/netinterface_qtnet.cpp
  60.  
  61.      noncore/iceagent.cpp
  62. @@ -61,12 +62,6 @@ if(UNIX)
  63.      list(APPEND SOURCES corelib/netinterface_unix.cpp)
  64.  endif()
  65.  
  66. -if(NOT USE_QJDNS)
  67. -    list(APPEND SOURCES corelib/netinterface_qtname.cpp)
  68. -else()
  69. -    list(APPEND SOURCES corelib/netnames_jdns.cpp)
  70. -endif()
  71. -
  72.  set(HEADERS
  73.      corelib/irisnetexport.h
  74.      corelib/irisnetglobal.h
  75. @@ -130,10 +125,6 @@ if(WIN32)
  76.      set(EXTRA_LDFLAGS ws2_32 iphlpapi)
  77.  endif()
  78.  
  79. -if(NOT USE_QJDNS)
  80. -    set(QJDns_LIBRARY "")
  81. -endif()
  82. -
  83.  target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
  84.  target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml)
  85.  if (BUNDLED_QCA)
  86. @@ -141,7 +132,7 @@ if (BUNDLED_QCA)
  87.  endif()
  88.  target_link_libraries(irisnet ${qca_LIB})
  89.  target_link_libraries(irisnet ${sctpLab_LIBRARY})
  90. -target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
  91. +target_link_libraries(irisnet ${EXTRA_LDFLAGS})
  92.  
  93.  # usrsctp requires pthread
  94.  if(NOT WIN32)
  95. diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
  96. index 9fa72cb..5c2814e 100644
  97. --- a/src/xmpp/CMakeLists.txt
  98. +++ b/src/xmpp/CMakeLists.txt
  99. @@ -224,10 +224,6 @@ else()
  100.  endif()
  101.  
  102.  
  103. -if( SEPARATE_QJDNS AND WIN32)
  104. -    set(EXTRA_LDFLAGS ws2_32)
  105. -endif()
  106. -
  107.  target_link_libraries(iris PRIVATE ${EXTRA_LDFLAGS} stringprep irisnet)
  108.  target_link_libraries(iris PUBLIC ${ZLIB_LIBRARY} Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml)
  109.  target_link_libraries(iris PUBLIC ${qca_LIB})
  110.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement