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

and now it works... we will see...

Browse source
This commit is contained in:
HanzZ 2011-06-17 00:07:09 +02:00
parent 269240db77
commit cbd571766e
4 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backends/libircclient-qt/CMakeLists.txt
View file

@ -4,7 +4,7 @@ FILE(GLOB HEADERS *.h)
QT4_WRAP_CPP(SRC ${HEADERS})
ADD_EXECUTABLE(spectrum_libircclient-qt_backend ${SRC})
target_link_libraries(spectrum_libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport -lpthread -lssl -lidn -lxml2)
target_link_libraries(spectrum_libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport)
INSTALL(TARGETS spectrum_libircclient-qt_backend RUNTIME DESTINATION bin)

2
backends/libpurple/CMakeLists.txt
View file

@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp)
ADD_EXECUTABLE(spectrum_libpurple_backend ${SRC})
target_link_libraries(spectrum_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport -lpthread -lssl -lidn -lxml2)
target_link_libraries(spectrum_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport)
INSTALL(TARGETS spectrum_libpurple_backend RUNTIME DESTINATION bin)

21
cmake_modules/SwiftenConfig.cmake
View file

@ -2,18 +2,15 @@ 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)
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 -lpthread -lssl -lidn -lxml2)
target_link_libraries(spectrum2 transport)
INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)