WIP WIP WIP

This will probably conflict with the clangd change. It doesn't compile
yet, but is on the way to doing so.

src/CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required (VERSION 3.22)
+# TODO: explicit path shouldn't be required
 include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
-                     ${CMAKE_SOURCE_DIR}/src/tc
-                     ${CMAKE_SOURCE_DIR}/src/tc/lib
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
                      ${CMAKE_SOURCE_DIR}/src/libshared/src
+                     ${CMAKE_SOURCE_DIR}/build/src/tc/corrosion_generated/cxxbridge/taskchampion-cpp/include
                      ${TASK_INCLUDE_DIRS})
 
 add_library (task STATIC CLI2.cpp CLI2.h
@@ -53,11 +53,11 @@ add_executable (calc_executable calc.cpp)
 add_executable (lex_executable lex.cpp)
 
 # Yes, 'task' (and hence libshared) is included twice, otherwise linking fails on assorted OSes.
-# Similarly for `tc`.
-target_link_libraries (task_executable task tc commands tc columns libshared task libshared ${TASK_LIBRARIES})
+# Similarly for `taskchampion-lib`.
+target_link_libraries (task_executable task taskchampion-lib commands taskchampion-lib columns libshared task libshared ${TASK_LIBRARIES})
 target_link_libraries (tmp_executable taskchampion-cpp ${TASK_LIBRARIES})
-target_link_libraries (calc_executable task tc commands tc columns libshared task libshared ${TASK_LIBRARIES})
-target_link_libraries (lex_executable  task tc commands tc columns libshared task libshared ${TASK_LIBRARIES})
+target_link_libraries (calc_executable task taskchampion-lib commands taskchampion-lib columns libshared task libshared ${TASK_LIBRARIES})
+target_link_libraries (lex_executable  task taskchampion-lib commands taskchampion-lib columns libshared task libshared ${TASK_LIBRARIES})
 if (DARWIN)
     # SystemConfiguration is required by Rust libraries like reqwest, to get proxy configuration.
     target_link_libraries (task_executable "-framework CoreFoundation -framework Security -framework SystemConfiguration")