X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=gui%2FCMakeLists.txt;h=8968cb4852f2c52eff7e328f7f822b59941864fa;hb=4ee4ab768d175c2bf9497b0a4cf5b98f0c6dd406;hp=7c54e26a060cac33d0f654dc9149e7e3616193ec;hpb=3165c839ef552d2110391b6258bc4088d742b5da;p=apitrace

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 7c54e26..8968cb4 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -2,17 +2,38 @@
 include( ${QT_USE_FILE} )
 
 set(qapitrace_SRCS
+   apisurface.cpp
    apitrace.cpp
    apicalldelegate.cpp
    apitracecall.cpp
    apitracefilter.cpp
    apitracemodel.cpp
-   loaderthread.cpp
+   argumentseditor.cpp
+   glsledit.cpp
+   imageviewer.cpp
+   jumpwidget.cpp
    mainwindow.cpp
    main.cpp
+   profiledialog.cpp
+   profiletablemodel.cpp
    retracer.cpp
+   saverthread.cpp
+   searchwidget.cpp
    settingsdialog.cpp
+   shaderssourcewidget.cpp
+   tracedialog.cpp
+   traceloader.cpp
+   traceprocess.cpp
+   trimprocess.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})
@@ -20,23 +41,42 @@ qt4_automoc(${qapitrace_SRCS})
 qt4_add_resources(qapitrace_SRCS qapitrace.qrc)
 
 set(qapitrace_UIS
+   ui/argumentseditor.ui
+   ui/imageviewer.ui
+   ui/jumpwidget.ui
    ui/mainwindow.ui
+   ui/profiledialog.ui
+   ui/profilereplaydialog.ui
    ui/retracerdialog.ui
-   ui/settings.ui)
+   ui/settings.ui
+   ui/tracedialog.ui
+   ui/searchwidget.ui
+   ui/shaderssourcewidget.ui
+   )
 
 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}/..)
-
-add_definitions(-DBUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}/..")
+include_directories(${QT_INCLUDES} ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 add_executable(qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H})
 
-target_link_libraries(qapitrace trace ${QJSON_LIBRARIES} ${QT_LIBRARIES} )
+target_link_libraries (qapitrace
+    common
+    ${PNG_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+    ${SNAPPY_LIBRARIES}
+    ${QJSON_LIBRARIES}
+    ${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 ${INSTALL_TARGETS_DEFAULT_ARGS} )
-#install( FILES qapitrace.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install (TARGETS qapitrace RUNTIME DESTINATION bin)
+#install (FILES qapitrace.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})