Merge branch 'master' into compression

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fffebf01582752b9a2d7de9302e5cb77d61876cb..39ffde57885c1a5886445d7d6c976d467d292255 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ project (apitrace)
 # still providing a mechanism to force/disable these optional dependencies, as
 # prescribed in http://www.gentoo.org/proj/en/qa/automagic.xml
 
-set (ENABLE_GUI "AUTO" CACHE STRING "Enable QT GUI.")
+set (ENABLE_GUI "AUTO" CACHE STRING "Enable Qt GUI.")
 
 
 ##############################################################################
@@ -140,6 +140,13 @@ add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL)
 include_directories (${ZLIB_INCLUDE_DIRS})
 link_libraries (${ZLIB_LIBRARIES})
 
+set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
+set (SNAPPY_LIBRARIES snappy_bundled)
+add_subdirectory (thirdparty/snappy EXCLUDE_FROM_ALL)
+
+include_directories (${SNAPPY_INCLUDE_DIRS})
+link_libraries (${SNAPPY_LIBRARIES})
+
 set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
 set (PNG_DEFINITIONS "")
 set (PNG_LIBRARIES png_bundled)
@@ -173,9 +180,11 @@ else (WIN32)
 endif (WIN32)
 
 add_library (common
+    trace_file.cpp
     trace_model.cpp
     trace_parser.cpp
     trace_writer.cpp
+    trace_local_writer.cpp
     trace_model_writer.cpp
     image.cpp
     image_bmp.cpp
@@ -338,7 +347,7 @@ else ()
     )
 
     target_link_libraries (glxtrace dl ${X11_X11_LIB})
-    
+
     install (TARGETS glxtrace LIBRARY DESTINATION lib)
 endif ()