X-Git-Url: https://git.cworth.org/git?p=apitrace;a=blobdiff_plain;f=CMakeLists.txt;h=ac046f51266e469184860c78fe4fa7975d758de5;hp=3ec262946578cfa7707dbdbd9f58ff8fd2e0d63b;hb=HEAD;hpb=8fae49d8ccee46f43bb06f035dd5b3ea105ba3aa diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ec2629..ac046f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,6 +191,11 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ) + CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND) + if (READPROC_H_FOUND) + add_definitions (-DHAVE_READPROC_H) + find_library (proc_LIBRARY NAMES proc procps) + endif () endif() if (WIN32 OR APPLE) @@ -247,6 +252,7 @@ endif () if (WIN32) add_subdirectory (thirdparty/less) + add_subdirectory (thirdparty/directxtex) endif () # Always use bundled QJSon. @@ -293,6 +299,7 @@ endif () add_library (common STATIC common/trace_callset.cpp common/trace_dump.cpp + common/trace_fast_callset.cpp common/trace_file.cpp common/trace_file_read.cpp common/trace_file_write.cpp @@ -311,7 +318,6 @@ add_library (common STATIC ) set_target_properties (common PROPERTIES - COMPILE_DEFINITIONS APITRACE_SOURCE_DIR="${CMAKE_SOURCE_DIR}" # Ensure it can be statically linked in shared libraries COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}" ) @@ -348,11 +354,22 @@ endif () install ( PROGRAMS - ${CMAKE_CURRENT_SOURCE_DIR}/scripts/tracediff.py - ${CMAKE_CURRENT_SOURCE_DIR}/scripts/jsondiff.py - ${CMAKE_CURRENT_SOURCE_DIR}/scripts/snapdiff.py + scripts/highlight.py + scripts/jsondiff.py + scripts/profileshader.py + scripts/retracediff.py + scripts/snapdiff.py + scripts/tracecheck.py + scripts/tracediff.py + scripts/unpickle.py DESTINATION ${SCRIPTS_INSTALL_DIR} ) +if (WIN32) + install ( + PROGRAMS scripts/convert.py + DESTINATION ${SCRIPTS_INSTALL_DIR} + ) +endif () ############################################################################## # GUI