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

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 161bfef..8968cb4 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -1,53 +1,82 @@
-cmake_minimum_required(VERSION 2.8)
-
-find_package(Qt4 REQUIRED)
+# Include the cmake file needed to use qt4
+include( ${QT_USE_FILE} )
 
 set(qapitrace_SRCS
-   ../trace_model.cpp
+   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})
 
+qt4_add_resources(qapitrace_SRCS qapitrace.qrc)
+
 set(qapitrace_UIS
-   ui/mainwindow.ui)
+   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/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)
-
-if (ZLIB_FOUND)
-    include_directories (${ZLIB_INCLUDE_DIRS})
-    link_libraries (${ZLIB_LIBRARIES})
-else (ZLIB_FOUND)
-    add_library (zlib STATIC
-        ../zlib/adler32.c
-        ../zlib/compress.c
-        ../zlib/crc32.c
-        ../zlib/gzio.c
-        ../zlib/uncompr.c
-        ../zlib/deflate.c
-        ../zlib/trees.c
-        ../zlib/zutil.c
-        ../zlib/inflate.c
-        ../zlib/infback.c
-        ../zlib/inftrees.c
-        ../zlib/inffast.c
-    )
-    include_directories (zlib)
-    link_libraries (zlib)
-endif (ZLIB_FOUND)
-
-include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
+link_directories(${LINK_DIRECTORIES} ${QJSON_LIBRARY_DIRS})
+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 ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_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})