X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=3d97b1ea9febc57be520a8fedb189306aef10d5e;hb=a684451ce345c9d3667921520a4a75e387811ad6;hp=f5b7c34d0bb6fe914e1abc62645133711cb87089;hpb=8d1d532f4bcd04bc2855980669dc6cabec0c6415;p=apitrace

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5b7c34..3d97b1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,6 +224,7 @@ endif ()
 # - To make it easier to build the GUI on Windows and MacOSX, as there are no
 # binaries at all.
 if (QT4_FOUND)
+    add_definitions (-DQJSON_EXPORT=)
     add_subdirectory (thirdparty/qjson EXCLUDE_FROM_ALL)
     set (QJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
     set (QJSON_LIBRARY_DIRS)
@@ -277,6 +278,7 @@ set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
 add_definitions(
     -DAPITRACE_BINARY_DIR="${CMAKE_BINARY_DIR}"
     -DAPITRACE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
+    -DAPITRACE_PROGRAMS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/bin"
     -DAPITRACE_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}"
     -DAPITRACE_WRAPPERS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}"
 )
@@ -325,6 +327,7 @@ add_library (common STATIC
     common/image_bmp.cpp
     common/image_pnm.cpp
     common/image_png.cpp
+    common/trace_option.cpp
     common/${os}
 )