cli: Merge trace_resource.cpp and trace_tools_trace.cpp in.

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e39bb45f2206bd91579ea51f34d6e49d8049ce6f..1c4094f6357730dd85351a000b8b3807fa1aa912 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,8 +320,6 @@ add_library (common STATIC
     common/trace_writer_local.cpp
     common/trace_writer_model.cpp
     common/trace_loader.cpp
-    common/trace_resource.cpp
-    common/trace_tools_trace.cpp
     common/trace_profiler.cpp
     common/image.cpp
     common/image_bmp.cpp
@@ -338,7 +336,9 @@ set_target_properties (common PROPERTIES
 )
 
 if (ANDROID)
-    target_link_libraries (common log)
+    target_link_libraries (common
+        log
+    )
 endif ()
 
 
@@ -355,7 +355,10 @@ add_subdirectory (retrace)
 # CLI
 
 if (ENABLE_CLI)
-    add_subdirectory(cli)
+    if (WIN32)
+        add_subdirectory (inject)
+    endif ()
+    add_subdirectory (cli)
 endif ()
 
 ##############################################################################