From 6ad679c1fd35ded99d783ed7e5893c41368bbe97 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 16 Apr 2024 20:00:25 +0300
Subject: [PATCH] Refactor CCL as standalone static library

---
 .vscode/settings.json        | 10 +++++++++-
 ccl/CMakeLists.txt           | 17 +++++++++++++----
 ccl/core/test/CMakeLists.txt |  5 -----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2c7548e..d45c67f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "cSpell.words": [
+    "coredll",
     "DCMAKE",
     "debool",
     "Decartian",
@@ -13,5 +14,12 @@
     "pyconcept",
     "rslang",
     "symmdiff"
-  ]
+  ],
+  "cmake.configureOnEdit": false,
+  "cmake.configureOnOpen": false,
+  "cmake.sourceDirectory": "${workspaceFolder}/ccl",
+  "cmake.configureArgs": ["--preset=conan-default"],
+  "cmake.buildArgs": ["--preset=conan-release"],
+  "cmake.ctestArgs": ["--test-dir build", "--output-on-failure"],
+  "cmake.installPrefix": "output"
 }
diff --git a/ccl/CMakeLists.txt b/ccl/CMakeLists.txt
index 2946cf5..39e370a 100644
--- a/ccl/CMakeLists.txt
+++ b/ccl/CMakeLists.txt
@@ -34,6 +34,12 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 target_sources(${PROJECT_NAME}
   PRIVATE
     core/unity/CCL.cpp
+    cclGraph/src/CGraph.cpp
+    rslang/unity/reflex_unity1.cpp
+    rslang/unity/reflex_unity2.cpp
+    rslang/unity/RSlang.cpp
+    rslang/unity/RSlang2.cpp
+    cclLang/unity/cclLang.cpp
 )
 target_include_directories(${PROJECT_NAME}
   PUBLIC
@@ -45,12 +51,15 @@ target_include_directories(${PROJECT_NAME}
   PRIVATE
     core/import/include
     core/header
+    cclGraph/header
+    cclGraph/import/include
+    rslang/header
+    rslang/import/include
+    rslang/import/reflex/include
+    cclLang/header
+    cclLang/import/include
 )
 target_link_libraries(${PROJECT_NAME}
-  INTERFACE
-    RSLang
-    cclLang
-    cclGraph
   PRIVATE
     ccl_CXXwarnings
     ccl_CXXoptions
diff --git a/ccl/core/test/CMakeLists.txt b/ccl/core/test/CMakeLists.txt
index 19e2cbf..797d35f 100644
--- a/ccl/core/test/CMakeLists.txt
+++ b/ccl/core/test/CMakeLists.txt
@@ -21,11 +21,6 @@ target_link_libraries(ccl_Tests
     GTest::gtest
     GTest::gtest_main
 )
-# TODO: use top level project output directory instead
-target_link_directories(ccl_Tests
-  PRIVATE
-    ../../../output/lib
-)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   target_compile_options(ccl_Tests