From 269240db77d3dedc437bfb3095400b732368d884 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Thu, 16 Jun 2011 23:57:05 +0200 Subject: [PATCH] Don't link against swiften-config stuff --- backends/libircclient-qt/CMakeLists.txt | 2 +- backends/libpurple/CMakeLists.txt | 2 +- src/config.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backends/libircclient-qt/CMakeLists.txt b/backends/libircclient-qt/CMakeLists.txt index eed9a3ca..9ac78875 100644 --- a/backends/libircclient-qt/CMakeLists.txt +++ b/backends/libircclient-qt/CMakeLists.txt @@ -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) +target_link_libraries(spectrum_libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport -lpthread -lssl -lidn -lxml2) INSTALL(TARGETS spectrum_libircclient-qt_backend RUNTIME DESTINATION bin) diff --git a/backends/libpurple/CMakeLists.txt b/backends/libpurple/CMakeLists.txt index bab08739..7c653ff7 100644 --- a/backends/libpurple/CMakeLists.txt +++ b/backends/libpurple/CMakeLists.txt @@ -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) +target_link_libraries(spectrum_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport -lpthread -lssl -lidn -lxml2) INSTALL(TARGETS spectrum_libpurple_backend RUNTIME DESTINATION bin) diff --git a/src/config.cpp b/src/config.cpp index 42c690eb..2ac7836b 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -55,8 +55,8 @@ bool Config::load(const std::string &configfile, boost::program_options::options ("database.prefix", value()->default_value(""), "Prefix of tables in database") ; -// store(parse_config_file(ifs, opts), m_variables); -// notify(m_variables); + store(parse_config_file(ifs, opts), m_variables); + notify(m_variables); m_file = configfile;