Skip to content
Snippets Groups Projects
Commit 4cda26e4 authored by Ziqi Zhou's avatar Ziqi Zhou
Browse files

chore: update cmake

parent ce939583
No related branches found
No related tags found
1 merge request!236Feat: support traveled distance condition
Pipeline #67825 passed
...@@ -70,10 +70,10 @@ target_include_directories( ...@@ -70,10 +70,10 @@ target_include_directories(
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
) )
target_link_libraries(${PROJECT_NAME} PUBLIC openscenario_api::shared target_link_libraries(${PROJECT_NAME} PUBLIC openscenario_api::shared
antlr4_runtime::shared antlr4_runtime::shared
Yase::agnostic_behavior_tree Yase::agnostic_behavior_tree
units::units units::units
MantleAPI::MantleAPI MantleAPI::MantleAPI
PRIVATE Stochastics::Stochastics) PRIVATE Stochastics::Stochastics)
...@@ -195,6 +195,7 @@ target_sources( ...@@ -195,6 +195,7 @@ target_sources(
${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByEntityCondition/SpeedConditionTest.cpp ${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByEntityCondition/SpeedConditionTest.cpp
${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByEntityCondition/TimeHeadwayConditionTest.cpp ${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByEntityCondition/TimeHeadwayConditionTest.cpp
${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByEntityCondition/TimeToCollisionConditionTest.cpp ${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByEntityCondition/TimeToCollisionConditionTest.cpp
${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByEntityCondition/TraveledDistanceConditionTest.cpp
${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByValueCondition/SimulationTimeConditionTest.cpp ${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByValueCondition/SimulationTimeConditionTest.cpp
${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByValueCondition/UserDefinedValueConditionTest.cpp ${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/ByValueCondition/UserDefinedValueConditionTest.cpp
${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/GenericAction/AcquirePositionActionTest.cpp ${CMAKE_CURRENT_LIST_DIR}/tests/Storyboard/GenericAction/AcquirePositionActionTest.cpp
......
...@@ -111,7 +111,6 @@ list(APPEND ${PROJECT_NAME}_SOURCES ...@@ -111,7 +111,6 @@ list(APPEND ${PROJECT_NAME}_SOURCES
gen/Storyboard/ByEntityCondition/RelativeAngleCondition_impl.cpp gen/Storyboard/ByEntityCondition/RelativeAngleCondition_impl.cpp
gen/Storyboard/ByEntityCondition/RelativeClearanceCondition_impl.cpp gen/Storyboard/ByEntityCondition/RelativeClearanceCondition_impl.cpp
gen/Storyboard/ByEntityCondition/StandStillCondition_impl.cpp gen/Storyboard/ByEntityCondition/StandStillCondition_impl.cpp
gen/Storyboard/ByEntityCondition/TraveledDistanceCondition_impl.cpp
gen/Storyboard/ByValueCondition/ParameterCondition_impl.cpp gen/Storyboard/ByValueCondition/ParameterCondition_impl.cpp
gen/Storyboard/ByValueCondition/StoryboardElementStateCondition_impl.cpp gen/Storyboard/ByValueCondition/StoryboardElementStateCondition_impl.cpp
gen/Storyboard/ByValueCondition/TimeOfDayCondition_impl.cpp gen/Storyboard/ByValueCondition/TimeOfDayCondition_impl.cpp
...@@ -207,6 +206,7 @@ list(APPEND ${PROJECT_NAME}_SOURCES ...@@ -207,6 +206,7 @@ list(APPEND ${PROJECT_NAME}_SOURCES
src/Storyboard/ByEntityCondition/SpeedCondition_impl.cpp src/Storyboard/ByEntityCondition/SpeedCondition_impl.cpp
src/Storyboard/ByEntityCondition/TimeHeadwayCondition_impl.cpp src/Storyboard/ByEntityCondition/TimeHeadwayCondition_impl.cpp
src/Storyboard/ByEntityCondition/TimeToCollisionCondition_impl.cpp src/Storyboard/ByEntityCondition/TimeToCollisionCondition_impl.cpp
src/Storyboard/ByEntityCondition/TraveledDistanceCondition_impl.cpp
src/Storyboard/ByValueCondition/SimulationTimeCondition_impl.cpp src/Storyboard/ByValueCondition/SimulationTimeCondition_impl.cpp
src/Storyboard/ByValueCondition/UserDefinedValueCondition_impl.cpp src/Storyboard/ByValueCondition/UserDefinedValueCondition_impl.cpp
src/Storyboard/GenericAction/AcquirePositionAction_impl.cpp src/Storyboard/GenericAction/AcquirePositionAction_impl.cpp
...@@ -378,7 +378,6 @@ list(APPEND ${PROJECT_NAME}_HEADERS ...@@ -378,7 +378,6 @@ list(APPEND ${PROJECT_NAME}_HEADERS
gen/Storyboard/ByEntityCondition/TimeHeadwayCondition_impl.h gen/Storyboard/ByEntityCondition/TimeHeadwayCondition_impl.h
gen/Storyboard/ByEntityCondition/TimeToCollisionCondition.h gen/Storyboard/ByEntityCondition/TimeToCollisionCondition.h
gen/Storyboard/ByEntityCondition/TraveledDistanceCondition.h gen/Storyboard/ByEntityCondition/TraveledDistanceCondition.h
gen/Storyboard/ByEntityCondition/TraveledDistanceCondition_impl.h
gen/Storyboard/ByValueCondition/ParameterCondition.h gen/Storyboard/ByValueCondition/ParameterCondition.h
gen/Storyboard/ByValueCondition/ParameterCondition_impl.h gen/Storyboard/ByValueCondition/ParameterCondition_impl.h
gen/Storyboard/ByValueCondition/SimulationTimeCondition.h gen/Storyboard/ByValueCondition/SimulationTimeCondition.h
...@@ -571,6 +570,7 @@ list(APPEND ${PROJECT_NAME}_HEADERS ...@@ -571,6 +570,7 @@ list(APPEND ${PROJECT_NAME}_HEADERS
src/Node/TrafficSignalPhaseNode.h src/Node/TrafficSignalPhaseNode.h
src/Node/TriggerableCompositeNode.h src/Node/TriggerableCompositeNode.h
src/Storyboard/ByEntityCondition/TimeToCollisionCondition_impl.h src/Storyboard/ByEntityCondition/TimeToCollisionCondition_impl.h
src/Storyboard/ByEntityCondition/TraveledDistanceCondition_impl.h
src/Storyboard/ByValueCondition/UserDefinedValueCondition_impl.h src/Storyboard/ByValueCondition/UserDefinedValueCondition_impl.h
src/Storyboard/GenericAction/ActivateControllerAction.h src/Storyboard/GenericAction/ActivateControllerAction.h
src/Storyboard/GenericAction/ActivateControllerAction_base.h src/Storyboard/GenericAction/ActivateControllerAction_base.h
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment