Add qjson dependency and cleanup the cmake qt code.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd108fd9d8eae21a1dbb9725feb7ca533078ddaf..d189597779d0c6ee2a035d0918e4d50741af94ed 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,8 @@ set (CMAKE_USE_PYTHON_VERSION 2.6)
 
 find_package (PythonInterp REQUIRED)
 find_package (OpenGL REQUIRED)
-find_package (Qt4)
+find_package (Qt4 COMPONENTS QtCore QtGui QtWebKit)
+find_package (QJSON)
 
 if (NOT WIN32)
     # Always use the bundled zlib and libpng sources on Windows to make it easy
@@ -239,6 +240,8 @@ if (GLUT_INCLUDE_DIR)
     )
 endif (GLUT_INCLUDE_DIR)
 
-if (QT4_FOUND)
+if (QT4_FOUND AND QJSON_FOUND)
+    # Include the cmake file needed to use qt4
+    include( ${QT_USE_FILE} )
     add_subdirectory(gui)
-endif (QT4_FOUND)
+endif (QT4_FOUND AND QJSON_FOUND)

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 12ed63ed232bcbf0afb6ddbdef41133bea4e6a6e..acecf9e4f5534090673c3f5a18d6f426ef10edcf 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -17,13 +17,14 @@ set(qapitrace_UIS
 QT4_WRAP_UI(qapitrace_UIS_H ${qapitrace_UIS})
 
 #add_app_icon(qapitrace_SRCS ../icons/hi*-qapitrace.png)
+link_directories(${LINK_DIRECTORIES} ${QJSON_LIBRARY_DIRS})
+include_directories(${QT_INCLUDES} ${QJSON_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
 add_definitions(-DBUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}/..")
 
 add_executable(qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H})
 
-target_link_libraries(qapitrace trace ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTWEBKIT_LIBRARIES})
+target_link_libraries(qapitrace trace ${QJSON_LIBRARIES} ${QT_LIBRARIES} )
 
 ########### install files ###############
 

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 472ff27a4cac4a8fe78c2aef8472026df776fc65..592841c63015b24d623e2604bddd1c9a756b2ef6 100644 (file)
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -6,6 +6,8 @@
 #include "apitracemodel.h"
 #include "apitracefilter.h"
 
+#include <qjson/parser.h>
+
 #include <QAction>
 #include <QDebug>
 #include <QDir>