apitrace: Replace tracedump program with new "apitrace dump" command

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8688898d014f8a21e4f806a90a4088921814b662..0b4ab84f20c1c6e7aa59ba65b42ff97d3a530bdd 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,22 @@ else ()
     add_definitions (-Wno-sign-compare) # comparison between signed and unsigned integer expressions
 endif ()
 
+if (MINGW)
+    # Avoid depending on MinGW runtime DLLs
+    check_cxx_compiler_flag (-static-libgcc HAVE_STATIC_LIBGCC_FLAG)
+    if (HAVE_STATIC_LIBGCC_FLAG)
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc")
+        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc")
+        set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libgcc")
+    endif ()
+    check_cxx_compiler_flag (-static-libstdc++ HAVE_STATIC_LIBSTDCXX_FLAG)
+    if (HAVE_STATIC_LIBSTDCXX_FLAG)
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++")
+        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libstdc++")
+        set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libstdc++")
+    endif ()
+endif ()
+
 
 # Put all executables into the same top level build directory, regardless of
 # which subdirectory they are declared
@@ -192,12 +208,13 @@ endif ()
 
 add_library (common STATIC
     common/trace_file.cpp
-    common/trace_snappyfile.cpp
+    common/trace_file_zlib.cpp
+    common/trace_file_snappy.cpp
     common/trace_model.cpp
     common/trace_parser.cpp
     common/trace_writer.cpp
-    common/trace_local_writer.cpp
-    common/trace_model_writer.cpp
+    common/trace_writer_local.cpp
+    common/trace_writer_model.cpp
     common/trace_loader.cpp
     common/image.cpp
     common/image_bmp.cpp
@@ -213,10 +230,6 @@ set_target_properties (common PROPERTIES
 
 link_libraries (common)
 
-add_executable (tracedump tracedump.cpp)
-install (TARGETS tracedump RUNTIME DESTINATION bin) 
-
-
 ##############################################################################
 # API tracers
 
@@ -400,6 +413,7 @@ add_executable (glretrace
     glstate.cpp
     glstate_params.cpp
     retrace.cpp
+    retrace_stdc.cpp
     glws.cpp
     ${glws_os}
     ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
@@ -429,6 +443,10 @@ endif ()
 
 install (TARGETS glretrace RUNTIME DESTINATION bin) 
 
+##############################################################################
+# CLI
+
+add_subdirectory(cli)
 
 ##############################################################################
 # GUI