Always use bundled QJson.

[apitrace] / gui / CMakeLists.txt

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 6037b7dab00c3ca021e8d65035c000209d4d3f3b..8968cb4852f2c52eff7e328f7f822b59941864fa 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -25,8 +25,15 @@ set(qapitrace_SRCS
    traceloader.cpp
    traceprocess.cpp
    trimprocess.cpp
-   timelinewidget.cpp
    vertexdatainterpreter.cpp
+   graphing/frameaxiswidget.cpp
+   graphing/graphwidget.cpp
+   graphing/graphaxiswidget.cpp
+   graphing/graphview.cpp
+   graphing/heatmapview.cpp
+   graphing/heatmapverticalaxiswidget.cpp
+   graphing/histogramview.cpp
+   graphing/timeaxiswidget.cpp
  )
 
 qt4_automoc(${qapitrace_SRCS})
@@ -64,6 +71,11 @@ target_link_libraries (qapitrace
     ${QT_LIBRARIES}
 )
 
+# Recent builds of Qt no longer support i386 architecture
+if (APPLE)
+    set_target_properties (qapitrace PROPERTIES OSX_ARCHITECTURES x86_64)
+endif ()
+
 ########### install files ###############
 
 install (TARGETS qapitrace RUNTIME DESTINATION bin)