summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Schmelzer2011-11-03 17:21:02 +0100
committerSebastian Schmelzer2011-11-03 17:21:02 +0100
commitf5ef69ff4c9c32f6daf4f2978f7770dc290b5d4d (patch)
treeca82a653801b7541a19bdd66fef737d2a88077a0
parentminor docu fix (diff)
downloadlibChooser-master.tar.gz
libChooser-master.tar.xz
libChooser-master.zip
add missing bind to QtXMLHEADmaster
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/XSessionHandler.cpp4
2 files changed, 3 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cf2d72d..4639079 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,15 +16,8 @@ configure_file("Config.h.in" "Config.h")
include_directories("/usr/include" "${CMAKE_CURRENT_BINARY_DIR}")
set(QT_USE_QTXML TRUE)
-set(QT_USE_QTSVG TRUE)
-
include(${QT_USE_FILE})
-
-#set(LCHOOSER_MOC_HEADERS "SessionTreeModel.h")
-#set(LCHOOSER_MOC_SOURCES "SessionTreeModel.cpp")
-#QT4_WRAP_CPP(LCHOOSER_MOC_SOURCES ${LCHOOSER_MOC_HEADERS})
-
set(LCHOOSER_HEADERS "Session.h" "VSession.h" "VSessionHandler.h" "XSession.h" "XSessionHandler.h")
set(LCHOOSER_SOURCES "VSession.cpp" "VSessionHandler.cpp" "XSession.cpp" "XSessionHandler.cpp")
set(LCHOOSER_CONFIG_HEADERS "Version.h" "Config.h")
@@ -36,6 +29,7 @@ set(LCHOOSER_CONFIG_HEADERS "Version.h" "Config.h")
add_library (Chooser_static STATIC ${LCHOOSER_SOURCES} ${LCHOOSER_MOC_SOURCES} ${LCHOOSER_HEADERS} ${LCHOOSER_MOC_HEADERS} ${LCHOOSER_CONFIG_HEADERS})
set_target_properties (Chooser_static PROPERTIES OUTPUT_NAME Chooser)
add_library (Chooser_shared SHARED ${LCHOOSER_SOURCES} ${LCHOOSER_MOC_SOURCES} ${LCHOOSER_HEADERS} ${LCHOOSER_MOC_HEADERS} ${LCHOOSER_CONFIG_HEADERS})
+target_link_libraries(Chooser_shared ${QT_LIBRARIES})
set_target_properties (Chooser_shared PROPERTIES OUTPUT_NAME Chooser)
diff --git a/src/XSessionHandler.cpp b/src/XSessionHandler.cpp
index 4291a9a..a756d03 100644
--- a/src/XSessionHandler.cpp
+++ b/src/XSessionHandler.cpp
@@ -17,11 +17,11 @@
#include <QList>
#include <QFileInfo>
-
#include "XSessionHandler.h"
-#include "XSession.h"
#include "Session.h"
+#include "XSession.h"
+
XSessionHandler::XSessionHandler() {
// TODO Auto-generated constructor stub