Refactor CCL as standalone static library

This commit is contained in:
IRBorisov 2024-04-16 20:00:25 +03:00
parent b5210c3ad7
commit 6ad679c1fd
3 changed files with 22 additions and 10 deletions

10
.vscode/settings.json vendored
View File

@ -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"
}

View File

@ -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

View File

@ -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