1 files changed, 64 insertions, 54 deletions
diff --git a/pw_perf_test/CMakeLists.txt b/pw_perf_test/CMakeLists.txt
index 80f4487a2..3f5c5c782 100644
--- a/pw_perf_test/CMakeLists.txt
+++ b/pw_perf_test/CMakeLists.txt
@@ -16,44 +16,58 @@ include($ENV{PW_ROOT}/pw_build/pigweed.cmake)
 include($ENV{PW_ROOT}/pw_perf_test/backend.cmake)
 include($ENV{PW_ROOT}/pw_protobuf_compiler/proto.cmake)
 
-pw_add_library(pw_perf_test.duration_unit INTERFACE
-  HEADERS
-    public/pw_perf_test/internal/duration_unit.h
+pw_add_library(pw_perf_test STATIC
   PUBLIC_INCLUDES
     public
-)
-
-pw_add_facade(pw_perf_test.timer INTERFACE
-  BACKEND
-    pw_perf_test.TIMER_INTERFACE_BACKEND
   HEADERS
-    public/pw_perf_test/internal/timer.h
-  PUBLIC_INCLUDES
-    public
+    public/pw_perf_test/internal/framework.h
+    public/pw_perf_test/internal/test_info.h
+    public/pw_perf_test/perf_test.h
   PUBLIC_DEPS
-    pw_perf_test.duration_unit
-)
-
-pw_add_library(pw_perf_test.event_handler INTERFACE
-  HEADERS
-    public/pw_perf_test/event_handler.h
-  PUBLIC_INCLUDES
-    public
+    pw_perf_test.event_handler
+    pw_perf_test.state
+    pw_perf_test.timer
+  SOURCES
+    framework.cc
+    perf_test.cc
+    test_info.cc
 )
 
-pw_add_library(pw_perf_test STATIC
+pw_add_library(pw_perf_test.state STATIC
   PUBLIC_INCLUDES
     public
   HEADERS
-    public/pw_perf_test/perf_test.h
+    public/pw_perf_test/state.h
   PUBLIC_DEPS
     pw_perf_test.timer
     pw_perf_test.event_handler
+    pw_assert
   PRIVATE_DEPS
     pw_log
-    pw_assert
   SOURCES
-    perf_test.cc
+    state.cc
+)
+
+if(NOT "${pw_perf_test.TIMER_INTERFACE_BACKEND}" STREQUAL "")
+  pw_add_test(pw_perf_test.state_test
+    SOURCES
+      state_test.cc
+    PRIVATE_DEPS
+      pw_assert.assert
+      pw_perf_test
+    GROUPS
+      modules
+      pw_perf_test
+  )
+endif()
+
+# Event handlers
+
+pw_add_library(pw_perf_test.event_handler INTERFACE
+  HEADERS
+    public/pw_perf_test/event_handler.h
+  PUBLIC_INCLUDES
+    public
 )
 
 pw_add_library(pw_perf_test.googletest_style_event_handler INTERFACE
@@ -85,15 +99,23 @@ pw_add_library(pw_perf_test.log_perf_handler_main STATIC
     log_perf_handler_main.cc
 )
 
-pw_add_library(pw_perf_test.chrono_timer INTERFACE
+# Timer facade
+
+pw_add_library(pw_perf_test.duration_unit INTERFACE
   HEADERS
-    chrono_public_overrides/pw_perf_test_timer_backend/timer.h
-    public/pw_perf_test/internal/chrono_timer_interface.h
+    public/pw_perf_test/internal/duration_unit.h
+  PUBLIC_INCLUDES
+    public
+)
+
+pw_add_facade(pw_perf_test.timer INTERFACE
+  BACKEND
+    pw_perf_test.TIMER_INTERFACE_BACKEND
+  HEADERS
+    public/pw_perf_test/internal/timer.h
   PUBLIC_INCLUDES
-    chrono_public_overrides
     public
   PUBLIC_DEPS
-    pw_chrono.system_clock
     pw_perf_test.duration_unit
 )
 
@@ -111,6 +133,20 @@ if(NOT "${pw_perf_test.TIMER_INTERFACE_BACKEND}" STREQUAL "")
   )
 endif()
 
+# Chrono timer facade implementation
+
+pw_add_library(pw_perf_test.chrono_timer INTERFACE
+  HEADERS
+    chrono_public_overrides/pw_perf_test_timer_backend/timer.h
+    public/pw_perf_test/internal/chrono_timer_interface.h
+  PUBLIC_INCLUDES
+    chrono_public_overrides
+    public
+  PUBLIC_DEPS
+    pw_chrono.system_clock
+    pw_perf_test.duration_unit
+)
+
 if(NOT "${pw_perf_test.TIMER_INTERFACE_BACKEND}"
     STREQUAL "pw_chrono.SYSTEM_CLOCK_BACKEND.NO_BACKEND_SET")
   pw_add_test(pw_perf_test.chrono_timer_test
@@ -125,29 +161,3 @@ if(NOT "${pw_perf_test.TIMER_INTERFACE_BACKEND}"
       pw_perf_test
   )
 endif()
-
-if(NOT "${pw_perf_test.TIMER_INTERFACE_BACKEND}" STREQUAL "")
-  pw_add_test(pw_perf_test.state_test
-    SOURCES
-      state_test.cc
-    PRIVATE_DEPS
-      pw_assert.assert
-      pw_perf_test
-    GROUPS
-      modules
-      pw_perf_test
-  )
-endif()
-
-if(NOT "${pw_perf_test.TIMER_INTERFACE_BACKEND}" STREQUAL "")
-  pw_add_test(pw_perf_test.perf_test_test
-    SOURCES
-      perf_test_test.cc
-    PRIVATE_DEPS
-      pw_assert.assert
-      pw_perf_test
-    GROUPS
-      modules
-      pw_perf_test
-  )
-endif()