cli: Add a new "apitrace diff" command.

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19eb813df10531841f93856d320d91cea5fdcf8a..39797a85e2a9ed8654375a1b48d0476ee86e902c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,14 +191,19 @@ else ()
     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
 endif ()
 
+set (LIB_INSTALL_DIR lib/apitrace)
+
 if (APPLE)
     # MacOSX uses fat binaries, so no need to have per-architecture wrapper
     # directories
-    set (WRAPPER_INSTALL_DIR lib/apitrace)
+    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
 else ()
-    set (WRAPPER_INSTALL_DIR lib/apitrace/${CMAKE_SYSTEM_PROCESSOR})
+    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}/${CMAKE_SYSTEM_PROCESSOR})
 endif ()
 
+set(SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
+set(WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
+
 # Expose the binary/install directories to source
 #
 # TODO: Use the same directory layout, for both build and install directories,
@@ -207,6 +212,7 @@ endif ()
 add_definitions(
     -DAPITRACE_BINARY_DIR="${CMAKE_BINARY_DIR}"
     -DAPITRACE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
+    -DAPITRACE_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}"
     -DAPITRACE_WRAPPER_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}"
 )
 
@@ -247,6 +253,7 @@ add_library (common STATIC
     common/trace_writer_local.cpp
     common/trace_writer_model.cpp
     common/trace_loader.cpp
+    common/trace_tools_trace.cpp
     common/image.cpp
     common/image_bmp.cpp
     common/image_pnm.cpp
@@ -402,12 +409,11 @@ else ()
     set_target_properties (glxtrace PROPERTIES
         # avoid the default "lib" prefix
         PREFIX ""
-    )
-
-    # Prevent symbol relocations internal to our wrapper library to be
-    # overwritten by the application.
-    set_target_properties (glxtrace PROPERTIES
+        # Prevent symbol relocations internal to our wrapper library to be
+        # overwritten by the application.
         LINK_FLAGS "-Wl,-Bsymbolic -Wl,-Bsymbolic-functions"
+        RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
+        LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
     )
 
     target_link_libraries (glxtrace dl ${X11_X11_LIB})
@@ -480,6 +486,11 @@ install (TARGETS glretrace RUNTIME DESTINATION bin)
 
 add_subdirectory(cli)
 
+##############################################################################
+# Scripts (to support the CLI)
+
+install (PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/tracediff.sh DESTINATION ${LIB_INSTALL_DIR}/scripts)
+
 ##############################################################################
 # GUI