[build] try cmake build again

test/CMakeLists.txt

@@ -1,29 +1,26 @@
 enable_testing()
 
 include_directories(
-  . ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/fmtlib
-  ${CMAKE_CURRENT_BINARY_DIR}/../src ${CMAKE_CURRENT_BINARY_DIR})
+        . ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/fmtlib
+        ${CMAKE_CURRENT_BINARY_DIR}/../src ${CMAKE_CURRENT_BINARY_DIR})
 
-add_library(testdummy STATIC test_stubs.cc)
-target_link_libraries(testdummy pcre::libpcre ncurses::libcurses)
-
-add_executable(test_abbrev test_abbrev.cc)
+add_executable(test_abbrev test_abbrev.cc test_stubs.cc)
 target_link_libraries(test_abbrev diag)
 add_test(NAME test_abbrev COMMAND test_abbrev)
 
-add_executable(test_ansi_scrubber test_ansi_scrubber.cc)
-target_link_libraries(test_ansi_scrubber diag testdummy)
+add_executable(test_ansi_scrubber test_ansi_scrubber.cc test_stubs.cc)
+target_link_libraries(test_ansi_scrubber diag)
 add_test(NAME test_ansi_scrubber COMMAND test_ansi_scrubber)
 
-add_executable(test_auto_fd test_auto_fd.cc)
+add_executable(test_auto_fd test_auto_fd.cc test_stubs.cc)
 target_link_libraries(test_auto_fd diag)
 add_test(NAME test_auto_fd COMMAND test_auto_fd)
 
-add_executable(test_auto_mem test_auto_mem.cc)
+add_executable(test_auto_mem test_auto_mem.cc test_stubs.cc)
 target_link_libraries(test_auto_mem diag)
 add_test(NAME test_auto_mem COMMAND test_auto_mem)
 
-add_executable(test_bookmarks test_bookmarks.cc)
+add_executable(test_bookmarks test_bookmarks.cc test_stubs.cc)
 target_link_libraries(test_bookmarks diag)
 add_test(NAME test_bookmarks COMMAND test_bookmarks)
 
@@ -39,38 +36,38 @@ add_executable(test_line_buffer2 test_line_buffer2.cc)
 target_link_libraries(test_line_buffer2 lnavfileio)
 add_test(NAME test_line_buffer2 COMMAND test_line_buffer2)
 
-add_executable(test_log_accel test_log_accel.cc)
-target_link_libraries(test_log_accel diag testdummy)
+add_executable(test_log_accel test_log_accel.cc test_stubs.cc)
+target_link_libraries(test_log_accel diag)
 add_test(NAME test_log_accel COMMAND test_log_accel)
 
-add_executable(lnav_doctests lnav_doctests.cc)
+add_executable(lnav_doctests lnav_doctests.cc test_stubs.cc)
 target_include_directories(lnav_doctests PUBLIC ../src/third-party/doctest-root)
-target_link_libraries(lnav_doctests diag testdummy ${lnav_LIBS})
+target_link_libraries(lnav_doctests diag ${lnav_LIBS})
 add_test(NAME lnav_doctests COMMAND lnav_doctests)
 
-add_executable(test_reltime test_reltime.cc)
+add_executable(test_reltime test_reltime.cc test_stubs.cc)
 target_include_directories(test_reltime PUBLIC ../src/third-party/doctest-root)
-target_link_libraries(test_reltime diag testdummy)
+target_link_libraries(test_reltime diag)
 add_test(NAME test_reltime COMMAND test_reltime)
 
-add_executable(test_top_status test_top_status.cc)
-target_link_libraries(test_top_status diag testdummy logfmt)
+add_executable(test_top_status test_top_status.cc test_stubs.cc)
+target_link_libraries(test_top_status diag logfmt)
 add_test(NAME test_top_status COMMAND test_top_status)
 
-add_executable(drive_view_colors drive_view_colors.cc)
-target_link_libraries(drive_view_colors diag testdummy)
+add_executable(drive_view_colors drive_view_colors.cc test_stubs.cc)
+target_link_libraries(drive_view_colors diag)
 
-add_executable(drive_vt52_curses drive_vt52_curses.cc)
-target_link_libraries(drive_vt52_curses diag testdummy)
+add_executable(drive_vt52_curses drive_vt52_curses.cc test_stubs.cc)
+target_link_libraries(drive_vt52_curses diag)
 
-add_executable(drive_logfile drive_logfile.cc)
-target_link_libraries(drive_logfile diag testdummy)
+add_executable(drive_logfile drive_logfile.cc test_stubs.cc)
+target_link_libraries(drive_logfile diag)
 
-add_executable(drive_sql_anno drive_sql_anno.cc)
-target_link_libraries(drive_sql_anno diag testdummy)
+add_executable(drive_sql_anno drive_sql_anno.cc test_stubs.cc)
+target_link_libraries(drive_sql_anno diag)
 
-add_executable(drive_data_scanner drive_data_scanner.cc)
-target_link_libraries(drive_data_scanner diag testdummy logfmt)
+add_executable(drive_data_scanner drive_data_scanner.cc test_stubs.cc)
+target_link_libraries(drive_data_scanner diag logfmt)
 
-add_executable(scripty scripty.cc)
-target_link_libraries(scripty diag testdummy)
+add_executable(scripty scripty.cc test_stubs.cc)
+target_link_libraries(scripty diag)

test/drive_data_scanner.cc

@@ -37,18 +37,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../src/data_parser.hh"
-#include "../src/view_curses.hh"
+#include "data_parser.hh"
+#include "view_curses.hh"
 #include "base/injector.hh"
 #include "config.h"
-#include "data_parser.hh"
 #include "data_scanner.hh"
 #include "elem_to_json.hh"
 #include "log_format.hh"
 #include "log_format_loader.hh"
 #include "pretty_printer.hh"
 #include "shared_buffer.hh"
-#include "textview_curses.hh"
 
 using namespace std;