Skip to content

Commit

Permalink
fix: dependencies for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
NikitaZotov committed Mar 21, 2024
1 parent 4ffb57c commit 634b273
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ link_directories(${SC_BIN_PATH} ${SC_EXTENSIONS_DIRECTORY})
set(SC_MACHINE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/ostis-web-platform/sc-machine")
set(SC_CODEGEN_TOOL "${SC_BIN_PATH}/sc-code-generator")
set(CMAKE_MODULE_PATH "${SC_MACHINE_PATH}/cmake")
include("${SC_MACHINE_PATH}/cmake/codegen.cmake")

if(${SC_BUILD_TESTS})
include(${CMAKE_MODULE_PATH}/tests.cmake)
endif()
include("${CMAKE_MODULE_PATH}/codegen.cmake")

set(SC_MEMORY_SRC "${SC_MACHINE_PATH}/sc-memory/")
set(SC_KPM_SRC "${SC_MACHINE_PATH}/sc-kpm/")
Expand All @@ -37,4 +33,9 @@ foreach(OUTPUT_CONFIG ${CMAKE_CONFIGURATION_TYPES})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${SC_BIN_PATH})
endforeach(OUTPUT_CONFIG)

if(${SC_BUILD_TESTS})
include(${CMAKE_MODULE_PATH}/tests.cmake)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
endif()

add_subdirectory(platform-dependent-components/problem-solver)
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ include_directories(
)

add_library(identifiers SHARED ${SOURCES})
target_link_libraries(identifiers sc-memory sc-agents-common)
target_link_libraries(identifiers sc-core sc-memory sc-agents-common)

sc_codegen_ex(identifiers ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/generated)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
make_tests_from_folder(${CMAKE_CURRENT_LIST_DIR}/units
NAME identifiers_module_test_starter
DEPENDS sc-agents-common identifiers sc-builder-lib
INCLUDES ${SC_MEMORY_SRC}/tests/sc-memory/_test ${CMAKE_CURRENT_LIST_DIR}/.. ${SC_MACHINE_ROOT}/sc-tools/sc-builder/src ${SC_MEMORY_SRC}/sc-memory
INCLUDES ${SC_MEMORY_SRC}/tests/sc-memory/_test ${CMAKE_CURRENT_LIST_DIR}/.. ${SC_TOOLS_SRC}/sc-builder/src ${SC_MEMORY_SRC}/sc-memory
)

add_definitions(-DMODULE_TEST_SRC_PATH="${CMAKE_CURRENT_LIST_DIR}")

0 comments on commit 634b273

Please sign in to comment.