stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't link against swiften-config stuff

Browse source
This commit is contained in:
HanzZ 2011-06-16 23:49:07 +02:00
parent fe3aa40faa
commit 8b9a06aa72
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cmake_modules/SwiftenConfig.cmake
View file

@ -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}")

2
spectrum/src/CMakeLists.txt
View file

@ -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)