diff -Naur libtransport/cmake_modules/SwiftenConfig.cmake libtransport2/cmake_modules/SwiftenConfig.cmake --- libtransport/cmake_modules/SwiftenConfig.cmake 2015-01-05 00:56:53.394900918 +0300 +++ libtransport2/cmake_modules/SwiftenConfig.cmake 2015-01-05 00:49:12.000000000 +0300 @@ -1,38 +1,7 @@ FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften 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} --libs - OUTPUT_VARIABLE SWIFTEN_LIB) - string(REGEX REPLACE "[\r\n]" " " SWIFTEN_LIB ${SWIFTEN_LIB}) - string(REGEX REPLACE " +$" "" SWIFTEN_LIB ${SWIFTEN_LIB}) - string(REGEX REPLACE " " ";" SWIFTEN_LIB ${SWIFTEN_LIB}) - set(SWIFTEN_LIBRARY "") - foreach(f ${SWIFTEN_LIB}) - STRING(SUBSTRING ${f} 0 2 f_out) - STRING(COMPARE EQUAL ${f_out} "/L" IS_PATH) - if(${IS_PATH}) - string(REGEX REPLACE "/LIBPATH:" "" f_replaced "${f}") - message("Added link directory: ${f_replaced}") - link_directories(${f_replaced}) - else() - list(APPEND SWIFTEN_LIBRARY ${f}) - endif() - endforeach(f) - set( SWIFTEN_FOUND 1 ) - else() - message( STATUS "Could NOT find swiften-config" ) - endif() +set(SWIFTEN_LIBRARY "Swiften") - if (SWIFTEN_FOUND) - set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR} ) - message( STATUS "Found libSwiften: ${SWIFTEN_LIBRARY}, ${SWIFTEN_INCLUDE_DIR}") - endif() +set( SWIFTEN_FOUND 1 ) -else( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) - message( STATUS "Could NOT find libSwiften" ) -endif( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )