Skip to content

DCP support (wip) #1558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
robbr48 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

DCP support (wip) #1558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions include/OMSimulator/Types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,12 @@ typedef enum {
typedef enum {
oms_component_none,
oms_component_fmu, ///< FMU
<<<<<<< HEAD
oms_component_fmu3, ///< FMU3
=======
oms_component_fmu3, ///< FMU3
oms_component_dcp, ///< DCP
>>>>>>> d03ad7e5 (Initial DCP support (wip))
oms_component_table, ///< lookup table
oms_component_external ///< external model
} oms_component_enu_t;
Expand Down
19 changes: 19 additions & 0 deletions src/OMSimulatorLib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ set(OMSIMULATORLIB_SOURCES
Clock.cpp
Clocks.cpp
Component.cpp
ComponentDCP.cpp
ComponentFMU3CS.cpp
ComponentFMUCS.cpp
ComponentFMU3ME.cpp
Expand Down Expand Up @@ -85,6 +86,15 @@ target_link_libraries(OMSimulatorLib
oms::3rd::pugixml::header
oms::3rd::json::header
oms::3rd::ctpl::header)
oms::3rd::xerces
oms::3rd::ctpl::header
oms::3rd::libzip
oms::3rd::dcplib::core
oms::3rd::dcplib::master
oms::3rd::dcplib::slave
oms::3rd::dcplib::ethernet
oms::3rd::dcplib::zip
oms::3rd::dcplib::xml)

target_link_libraries(OMSimulatorLib PUBLIC ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})

Expand Down Expand Up @@ -116,6 +126,15 @@ target_link_libraries(OMSimulatorLib_static
oms::3rd::pugixml::header
oms::3rd::json::header
oms::3rd::ctpl::header)
oms::3rd::xerces
oms::3rd::ctpl::header
oms::3rd::libzip
oms::3rd::dcplib::core
oms::3rd::dcplib::master
oms::3rd::dcplib::slave
oms::3rd::dcplib::ethernet
oms::3rd::dcplib::zip
oms::3rd::dcplib::xml)

target_link_libraries(OMSimulatorLib_static PUBLIC ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})

Expand Down
Loading