diff --git a/cmake_modules/SwiftenConfig.cmake b/cmake_modules/SwiftenConfig.cmake index ca806763..6a2567ee 100644 --- a/cmake_modules/SwiftenConfig.cmake +++ b/cmake_modules/SwiftenConfig.cmake @@ -2,18 +2,18 @@ FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften) FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften.h" PATH_SUFFIXES libSwiften Swiften ) if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) - find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable") - set( SWIFTEN_CFLAGS "" ) - if (SWIFTEN_CONFIG_EXECUTABLE) - execute_process( - COMMAND swiften-config --libs - OUTPUT_VARIABLE SWIFTEN_LIBRARY) - execute_process( - COMMAND swiften-config --cflags - OUTPUT_VARIABLE SWIFTEN_CFLAGS) - string(REGEX REPLACE "[\r\n]" " " SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}") - string(REGEX REPLACE " +$" "" SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}") - endif() +# find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable") +# set( SWIFTEN_CFLAGS "" ) +# if (SWIFTEN_CONFIG_EXECUTABLE) +# execute_process( +# COMMAND swiften-config --libs +# OUTPUT_VARIABLE SWIFTEN_LIBRARY) +# execute_process( +# COMMAND swiften-config --cflags +# OUTPUT_VARIABLE SWIFTEN_CFLAGS) +# string(REGEX REPLACE "[\r\n]" " " SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}") +# string(REGEX REPLACE " +$" "" SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}") +# endif() set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR}/.. ) message( STATUS "Found libSwiften: ${SWIFTEN_LIBRARY}, ${SWIFTEN_INCLUDE_DIR}") diff --git a/spectrum/src/CMakeLists.txt b/spectrum/src/CMakeLists.txt index 4a3e6432..aad30ebc 100644 --- a/spectrum/src/CMakeLists.txt +++ b/spectrum/src/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_EXECUTABLE(spectrum2 ${SRC}) ADD_DEPENDENCIES(spectrum2 libpurple_backend) ADD_DEPENDENCIES(spectrum2 libircclient-qt_backend) -target_link_libraries(spectrum2 transport) +target_link_libraries(spectrum2 transport -lpthread -lssl -lidn -lxml2) INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)