libtransport.git Changeset - 3f452931af76

Changeset - 3f452931af76

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Vitaly Takmazov - 10 years ago 2016-01-21 14:39:24
vitalyster@gmail.com

using our DummyConnectionServer* classes (Swiften ones are not installed by default)

2 files changed with 0 insertions and 11 deletions:

cmake_modules/SwiftenConfig.cmake

libtransport/CMakeLists.txt

0 comments (0 inline, 0 general)

cmake_modules/SwiftenConfig.cmake

➞

Show inline comments

 FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften Swiften3 HINTS ../lib)
 FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften/Swiften.h" PATH_SUFFIXES libSwiften Swiften HINTS ../include)
 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)
 		string(REGEX REPLACE "[\r\n]"                  " " SWIFTEN_LIB "${SWIFTEN_LIB}")
 		string(REGEX REPLACE " +$"                     ""  SWIFTEN_LIB "${SWIFTEN_LIB}")
 		set(SWIFTEN_LIBRARY "")
 		if (APPLE)
 			string(REGEX MATCHALL "-framework [A-Za-z]+" APPLE_FRAMEWORKS "${SWIFTEN_LIB}")
 			foreach(framework ${APPLE_FRAMEWORKS})
 				list(APPEND SWIFTEN_LIBRARY ${framework} )
 			endforeach(framework)
 			string(REGEX REPLACE "-framework [A-Za-z]+" "" SWIFTEN_LIB "${SWIFTEN_LIB}")

libtransport/CMakeLists.txt

➞

Show inline comments

@@ @@ -6,30 +6,24 @@ FILE(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp) @@
 if (NOT MSVC)
 if (APPLE)
 	string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 	string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 else()
 	string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 	string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 endif()
 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/)
 if (NOT WIN32)
 include_directories(${POPT_INCLUDE_DIR})
 endif()
 # SOURCE_GROUP(headers FILES ${HEADERS})
 if (PROTOBUF_FOUND)
 	if (NOT WIN32)

0 comments (0 inline, 0 general)