Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index a389942..12acf3b 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -46,12 +46,10 @@ set( CMAKE_MODULE_PATH
- )
- set( DEFAULT_BUNDLED_QCA OFF )
- -if (APPLE)
- +if (APPLE OR MSVC)
- set( DEFAULT_BUNDLED_QCA ON )
- endif()
- -option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
- -option( SEPARATE_QJDNS "Build qjdns with iris library" OFF )
- option( JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON )
- option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA})
- option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
- @@ -72,11 +70,6 @@ if(Qt5Core_FOUND)
- endif()
- endif()
- -if(USE_QJDNS)
- - message(WARNING "USE_QJDNS flag is enabled with Qt5. If you have problems with connection please disable this flag")
- - add_definitions(-DNEED_JDNS)
- -endif()
- -
- if(BUNDLED_QCA)
- message(STATUS "QCA: using bundled")
- set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
- @@ -165,18 +158,6 @@ if(JINGLE_SCTP)
- include(IrisSCTP)
- endif()
- -if(NOT USE_QJDNS AND SEPARATE_QJDNS)
- - message(FATAL_ERROR "SEPARATE_QJDNS flag enabled, but USE_QJDNS flag disabled.\nPlease enable flag USE_QJDNS or disable both flags")
- -endif()
- -
- -if(USE_QJDNS AND (NOT SEPARATE_QJDNS))
- - include(src/jdns.cmake)
- -elseif(USE_QJDNS)
- - set(QJDns_SUFFIX -qt5)
- - find_package(QJDns REQUIRED)
- - set(QJDns_LIBRARY ${QJDns_LIBRARY} PARENT_SCOPE)
- - include_directories( ${QJDns_INCLUDE_DIR} )
- -endif()
- if (NOT BUNDLED_QCA)
- find_package(B2 QUIET)
- diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
- index 0a5b049..d9a2889 100644
- --- a/src/irisnet/CMakeLists.txt
- +++ b/src/irisnet/CMakeLists.txt
- @@ -38,6 +38,7 @@ set(SOURCES
- corelib/netinterface.cpp
- corelib/netnames.cpp
- corelib/objectsession.cpp
- + corelib/netinterface_qtname.cpp
- corelib/netinterface_qtnet.cpp
- noncore/iceagent.cpp
- @@ -61,12 +62,6 @@ if(UNIX)
- list(APPEND SOURCES corelib/netinterface_unix.cpp)
- endif()
- -if(NOT USE_QJDNS)
- - list(APPEND SOURCES corelib/netinterface_qtname.cpp)
- -else()
- - list(APPEND SOURCES corelib/netnames_jdns.cpp)
- -endif()
- -
- set(HEADERS
- corelib/irisnetexport.h
- corelib/irisnetglobal.h
- @@ -130,10 +125,6 @@ if(WIN32)
- set(EXTRA_LDFLAGS ws2_32 iphlpapi)
- endif()
- -if(NOT USE_QJDNS)
- - set(QJDns_LIBRARY "")
- -endif()
- -
- target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
- target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml)
- if (BUNDLED_QCA)
- @@ -141,7 +132,7 @@ if (BUNDLED_QCA)
- endif()
- target_link_libraries(irisnet ${qca_LIB})
- target_link_libraries(irisnet ${sctpLab_LIBRARY})
- -target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
- +target_link_libraries(irisnet ${EXTRA_LDFLAGS})
- # usrsctp requires pthread
- if(NOT WIN32)
- diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
- index 9fa72cb..5c2814e 100644
- --- a/src/xmpp/CMakeLists.txt
- +++ b/src/xmpp/CMakeLists.txt
- @@ -224,10 +224,6 @@ else()
- endif()
- -if( SEPARATE_QJDNS AND WIN32)
- - set(EXTRA_LDFLAGS ws2_32)
- -endif()
- -
- target_link_libraries(iris PRIVATE ${EXTRA_LDFLAGS} stringprep irisnet)
- target_link_libraries(iris PUBLIC ${ZLIB_LIBRARY} Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml)
- target_link_libraries(iris PUBLIC ${qca_LIB})
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement