web: fix CMake test build and register missing tests

Add gui_descriptors to TEST_LIBS so every test in src/web/test/cpp picks
up the gui/include directory (web links gui_descriptors PRIVATE, so the
include path didn't propagate to consumers).  Also register the three
tests that existed in Bazel but not in CMake: TestClockTreeReport,
TestSaveImage, TestSnap.

Signed-off-by: Matt Liberty <mliberty@precisioninno.com>

Author: maliberty

src/web/test/cpp/CMakeLists.txt

@@ -6,6 +6,7 @@ set(TEST_LIBS
   utl_lib
   lodepng
   tst
+  gui_descriptors
   GTest::gtest
   GTest::gtest_main
 )
@@ -25,7 +26,7 @@ gtest_discover_tests(TestTileGenerator
 
 add_executable(TestRequestHandler TestRequestHandler.cpp)
 
-target_link_libraries(TestRequestHandler ${TEST_LIBS} gui_descriptors)
+target_link_libraries(TestRequestHandler ${TEST_LIBS})
 
 target_include_directories(TestRequestHandler
   PRIVATE
@@ -75,10 +76,52 @@ gtest_discover_tests(TestGlyphCache
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
+add_executable(TestClockTreeReport TestClockTreeReport.cpp)
+
+target_link_libraries(TestClockTreeReport ${TEST_LIBS})
+
+target_include_directories(TestClockTreeReport
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+)
+
+gtest_discover_tests(TestClockTreeReport
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+
+add_executable(TestSaveImage TestSaveImage.cpp)
+
+target_link_libraries(TestSaveImage ${TEST_LIBS})
+
+target_include_directories(TestSaveImage
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+)
+
+gtest_discover_tests(TestSaveImage
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+
+add_executable(TestSnap TestSnap.cpp)
+
+target_link_libraries(TestSnap ${TEST_LIBS})
+
+target_include_directories(TestSnap
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+)
+
+gtest_discover_tests(TestSnap
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+
 add_dependencies(build_and_test
   TestTileGenerator
   TestRequestHandler
   TestSaveReport
   TestDebugGraphics
   TestGlyphCache
+  TestClockTreeReport
+  TestSaveImage
+  TestSnap
 )