Merge branch 'gui-thumbnails'

[apitrace] / gui / CMakeLists.txt

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 161bfef6f73340b041fd84c48d9b3fa4f724948d..26346f25ed14d4b1a5c0317bda56b376ba9d2a32 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -1,53 +1,64 @@
-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
+   retracer.cpp
+   saverthread.cpp
+   searchwidget.cpp
+   settingsdialog.cpp
+   shaderssourcewidget.cpp
+   tracedialog.cpp
+   traceloader.cpp
+   traceprocess.cpp
+   vertexdatainterpreter.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/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}
+)
 
 ########### 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})