Move CLI and LSP server

src/frontend/CMakeLists.txt

@@ -23,17 +23,6 @@ add_executable(cxx ${SOURCES})
 
 target_link_libraries(cxx PRIVATE cxx-parser cxx-lsp)
 
-target_compile_definitions(cxx PRIVATE
-    CXX_VERSION="${CMAKE_PROJECT_VERSION}"
-)
-
-# if cmake founds the Threads package, link with it
-if(Threads_FOUND)
-    target_link_libraries(cxx PRIVATE Threads::Threads)
-else()
-    target_compile_definitions(cxx PRIVATE CXX_NO_THREADS)
-endif()
-
 if(EMSCRIPTEN)
     target_link_options(cxx PRIVATE
         "SHELL:-s EXIT_RUNTIME=1"

src/frontend/cxx/cli.cc

@@ -18,16 +18,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "cli.h"
-
+#include <cxx/cli.h>
 #include <cxx/private/path.h>
 
 #include <algorithm>
-#include <array>
 #include <format>
 #include <iostream>
 #include <sstream>
-#include <tuple>
 #include <utility>
 #include <vector>
 

src/frontend/cxx/frontend.cc

@@ -20,9 +20,11 @@
 
 #include <cxx/ast.h>
 #include <cxx/ast_visitor.h>
+#include <cxx/cli.h>
 #include <cxx/control.h>
 #include <cxx/gcc_linux_toolchain.h>
 #include <cxx/lexer.h>
+#include <cxx/lsp/lsp_server.h>
 #include <cxx/macos_toolchain.h>
 #include <cxx/preprocessor.h>
 #include <cxx/private/path.h>
@@ -42,8 +44,6 @@
 #include <string>
 
 #include "ast_printer.h"
-#include "cli.h"
-#include "lsp_server.h"
 #include "verify_diagnostics_client.h"
 
 namespace {

src/lsp/CMakeLists.txt

@@ -26,6 +26,15 @@ add_library(cxx-lsp
     ${CXX_LSP_INCLUDE_HEADER_FILES}
 )
 
+target_link_libraries(cxx-lsp PUBLIC cxx-parser)
+
+# if cmake founds the Threads package, link with it
+if(Threads_FOUND)
+    target_link_libraries(cxx-lsp PUBLIC Threads::Threads)
+else()
+    target_compile_definitions(cxx-lsp PUBLIC CXX_NO_THREADS)
+endif()
+
 target_include_directories(cxx-lsp
     PUBLIC  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
             $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>

src/frontend/cxx/cxx_document.h → src/lsp/cxx/lsp/cxx_document.h

@@ -20,14 +20,13 @@
 
 #pragma once
 
+#include <cxx/cli.h>
 #include <cxx/lsp/fwd.h>
 #include <cxx/translation_unit.h>
 
 #include <optional>
 #include <string>
 
-#include "cli.h"
-
 namespace cxx::lsp {
 
 class CxxDocument {

src/frontend/cxx/lsp_server.h → src/lsp/cxx/lsp/lsp_server.h

@@ -30,9 +30,10 @@
 #include <unordered_map>
 #endif
 
+#include <cxx/cli.h>
+
 #include <vector>
 
-#include "cli.h"
 #include "sync_queue.h"
 
 namespace cxx::lsp {

src/parser/CMakeLists.txt

@@ -27,6 +27,10 @@ add_library(cxx-parser ${SOURCES}
     pp_keywords-priv.h
 )
 
+target_compile_definitions(cxx-parser PUBLIC
+    CXX_VERSION="${CMAKE_PROJECT_VERSION}"
+)
+
 target_include_directories(cxx-parser
     PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
     PUBLIC  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>