X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=gui%2FCMakeLists.txt;h=6973450a9e5c16a1688ae24c233f8623d319af00;hb=4d0ef5d3d040704f61e0814c9260c1a2ca11c24d;hp=6787043cd5c32ea046dad76d06181c212e5b594b;hpb=f04cf8a9dd3150a0127a449e606ead585a31d6d2;p=apitrace

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 6787043..6973450 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -8,6 +8,7 @@ set(qapitrace_SRCS
    apitracecall.cpp
    apitracefilter.cpp
    apitracemodel.cpp
+   argumentseditor.cpp
    glsledit.cpp
    imageviewer.cpp
    jumpwidget.cpp
@@ -15,6 +16,7 @@ set(qapitrace_SRCS
    mainwindow.cpp
    main.cpp
    retracer.cpp
+   saverthread.cpp
    searchwidget.cpp
    settingsdialog.cpp
    shaderssourcewidget.cpp
@@ -28,6 +30,7 @@ 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
@@ -42,15 +45,15 @@ 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} ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-add_definitions(-DBUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}/..")
+add_definitions(-DBUILD_DIR="${CMAKE_BINARY_DIR}")
 
 add_executable(qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H})
 
-target_link_libraries(qapitrace trace ${QJSON_LIBRARIES} ${QT_LIBRARIES} )
+target_link_libraries(qapitrace common ${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})