From 066f09f03aa09c128603e4831054a6841e9d44fc Mon Sep 17 00:00:00 2001 From: HanzZ Date: Fri, 20 May 2011 10:23:48 +0200 Subject: [PATCH] better cmake --- CMakeLists.txt | 10 ++++++---- spectrum/src/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 746b48ed..aa73cafe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,6 +54,8 @@ if (PROTOBUF_FOUND) if(PURPLE_LIBRARY AND PURPLE_INCLUDE_DIR) message("Libpurple plugin : yes") + include_directories(${PURPLE_INCLUDE_DIR}) + include_directories(${GLIB2_INCLUDE_DIR}) else() message("Libpurple plugin : no (install libpurple)") endif() @@ -61,6 +63,8 @@ if (PROTOBUF_FOUND) if(IRC_FOUND) ADD_DEFINITIONS(-DIRC_SHARED) message("IRC plugin : yes") + include_directories(${IRC_INCLUDE_DIR}) + include(${QT_USE_FILE}) else() message("IRC plugin : no (install libircclient-qt and Google Protocol Buffers)") endif() @@ -95,13 +99,11 @@ SET(TRANSPORT_VERSION 2.0) SET(PROJECT_VERSION 2.0) include_directories(include) -include_directories(${PURPLE_INCLUDE_DIR}) + include_directories(${EVENT_INCLUDE_DIRS}) -include_directories(${GLIB2_INCLUDE_DIR}) include_directories(${SWIFTEN_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIRS}) -include_directories(${IRC_INCLUDE_DIR}) -include(${QT_USE_FILE}) + ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(include) diff --git a/spectrum/src/CMakeLists.txt b/spectrum/src/CMakeLists.txt index dcef1bef..26ee0696 100644 --- a/spectrum/src/CMakeLists.txt +++ b/spectrum/src/CMakeLists.txt @@ -6,5 +6,5 @@ ADD_EXECUTABLE(spectrum ${SRC}) ADD_DEPENDENCIES(spectrum libpurple_backend) ADD_DEPENDENCIES(spectrum libircclient-qt_backend) -target_link_libraries(spectrum ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport) +target_link_libraries(spectrum transport)