Skip to content

Commit bfa1103

Browse files
committed
Initial DCP support (wip)
1 parent 287953c commit bfa1103

File tree

17 files changed

+1455
-3
lines changed

17 files changed

+1455
-3
lines changed

3rdParty

Submodule 3rdParty updated 90 files

include/OMSimulator/Types.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,12 @@ typedef enum {
101101
typedef enum {
102102
oms_component_none,
103103
oms_component_fmu, ///< FMU
104+
<<<<<<< HEAD
104105
oms_component_fmu3, ///< FMU3
106+
=======
107+
oms_component_fmu3, ///< FMU3
108+
oms_component_dcp, ///< DCP
109+
>>>>>>> d03ad7e5 (Initial DCP support (wip))
105110
oms_component_table, ///< lookup table
106111
oms_component_external ///< external model
107112
} oms_component_enu_t;

src/OMSimulatorLib/CMakeLists.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ set(OMSIMULATORLIB_SOURCES
2525
Clock.cpp
2626
Clocks.cpp
2727
Component.cpp
28+
ComponentDCP.cpp
2829
ComponentFMU3CS.cpp
2930
ComponentFMUCS.cpp
3031
ComponentFMU3ME.cpp
@@ -85,6 +86,15 @@ target_link_libraries(OMSimulatorLib
8586
oms::3rd::pugixml::header
8687
oms::3rd::json::header
8788
oms::3rd::ctpl::header)
89+
oms::3rd::xerces
90+
oms::3rd::ctpl::header
91+
oms::3rd::libzip
92+
oms::3rd::dcplib::core
93+
oms::3rd::dcplib::master
94+
oms::3rd::dcplib::slave
95+
oms::3rd::dcplib::ethernet
96+
oms::3rd::dcplib::zip
97+
oms::3rd::dcplib::xml)
8898

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

@@ -116,6 +126,15 @@ target_link_libraries(OMSimulatorLib_static
116126
oms::3rd::pugixml::header
117127
oms::3rd::json::header
118128
oms::3rd::ctpl::header)
129+
oms::3rd::xerces
130+
oms::3rd::ctpl::header
131+
oms::3rd::libzip
132+
oms::3rd::dcplib::core
133+
oms::3rd::dcplib::master
134+
oms::3rd::dcplib::slave
135+
oms::3rd::dcplib::ethernet
136+
oms::3rd::dcplib::zip
137+
oms::3rd::dcplib::xml)
119138

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

0 commit comments

Comments
 (0)