diff --git a/cmake_modules/SwiftenConfig.cmake b/cmake_modules/SwiftenConfig.cmake index 0d677fcd61ac9e0c1af4e7b2fe64acc9de2407ae..34217b3a7fd87100b8bebee1551a2038e41db8ef 100644 --- a/cmake_modules/SwiftenConfig.cmake +++ b/cmake_modules/SwiftenConfig.cmake @@ -5,11 +5,6 @@ if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable" HINTS ../bin) set( SWIFTEN_CFLAGS "" ) if (SWIFTEN_CONFIG_EXECUTABLE) - execute_process( - COMMAND ${SWIFTEN_CONFIG_EXECUTABLE} --version - OUTPUT_VARIABLE SWIFTEN_VERSION) - string(REGEX MATCH "([0-9])" SWIFTEN_VERSION "${SWIFTEN_VERSION}") - message(STATUS "Swiften version ${SWIFTEN_VERSION}") execute_process( COMMAND ${SWIFTEN_CONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE SWIFTEN_LIB) diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index 0773f9365808ddaa3aa943530d1a2d567ca279d8..dee844d97096ed9a9f36d1513fcf739983865e13 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -15,12 +15,6 @@ else() string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") endif() -if (SWIFTEN_VERSION GREATER 2) - list(REMOVE_ITEM SWIFTEN_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../include/Swiften/Network/DummyConnectionServer.h") - list(REMOVE_ITEM SWIFTEN_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../include/Swiften/Network/DummyConnectionServerFactory.h") - list(REMOVE_ITEM SWIFTEN_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../include/Swiften/Network/DummyConnectionServer.cpp") - list(REMOVE_ITEM SWIFTEN_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../include/Swiften/Network/DummyConnectionServerFactory.cpp") -endif() FILE(GLOB HEADERS ../include/transport/*.h) include_directories(../spectrum/src/frontends/xmpp/)