X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=e840f21d193608b386d33edf84f72ea3511e1ea9;hb=3887a0e91e021305b062e2ed280e05fee2a9f846;hp=64e63bf1d9192df95a8eeb700b20d61e6ba957b0;hpb=a26cf3eea71454aa5cc466a2abbe01537c95c31c;p=apitrace diff --git a/CMakeLists.txt b/CMakeLists.txt index 64e63bf..e840f21 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,6 @@ set (CMAKE_USE_PYTHON_VERSION 2.7 2.6) find_package (PythonInterp REQUIRED) find_package (OpenGL REQUIRED) -find_package (Snappy REQUIRED) if (ENABLE_GUI) if (NOT (ENABLE_GUI STREQUAL "AUTO")) @@ -141,7 +140,12 @@ add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL) include_directories (${ZLIB_INCLUDE_DIRS}) link_libraries (${ZLIB_LIBRARIES}) -link_libraries(${SNAPPY_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 "") @@ -177,9 +181,11 @@ endif (WIN32) add_library (common trace_file.cpp + trace_snappyfile.cpp trace_model.cpp trace_parser.cpp trace_writer.cpp + trace_local_writer.cpp trace_model_writer.cpp image.cpp image_bmp.cpp