File tree Expand file tree Collapse file tree
src/OpenCOVER/plugins/hlrs/Traffic Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11using (osgcal )
22
3- find_package (cppzmq )
4- find_package (Protobuf REQUIRED )
5-
6- protobuf_generate_cpp (PROTO_SRCS PROTO_HDRS traffic_simulator.proto )
73
84set (HEADERS
95 Traffic.h
106 Geometry.h
117 PedestrianGeometry.h
128 CarGeometry.h
139 Connector.h
14- ConnectorZmq.h
1510 sumo/ConnectorSumo.h
1611 sumo/socket.h
1712 sumo/storage.h
@@ -20,40 +15,26 @@ set(HEADERS
2015 sumo/TraCIConstants.h
2116 sumo/config.h
2217)
18+
2319set (SOURCES
2420 Traffic.cpp
2521 Geometry.cpp
2622 PedestrianGeometry.cpp
2723 CarGeometry.cpp
28- ConnectorZmq.cpp
2924 sumo/ConnectorSumo.cpp
3025 sumo/socket.cpp
3126 sumo/storage.cpp
3227 sumo/TraCIAPI.cpp
3328)
3429
35- INCLUDE_DIRECTORIES (
30+ include_directories (
3631 ${OSGCAL_INCLUDE_DIR}
37- ${PROTOBUF_INCLUDE_DIRS}
3832)
3933
40- # Fix protobuf linking. Thanks, mvf!
41- # https://github.com/protocolbuffers/protobuf/issues/12637#issuecomment-1871458639
42- string (REGEX REPLACE "^[0-9]+\. ([0-9]+\. [0-9]+)$" "\\ 1.0" proto_libver "${Protobuf_VERSION} " )
43- if (proto_libver VERSION_GREATER_EQUAL "22" )
44- find_package (PkgConfig REQUIRED )
45- pkg_check_modules (protobuf REQUIRED IMPORTED_TARGET protobuf=${proto_libver} )
46- set (PROTO_LIB PkgConfig::protobuf)
47- else ()
48- set (PROTO_LIB protobuf::libprotobuf)
49- endif ()
50-
51- cover_add_plugin (Traffic ${HEADERS} ${PROTO_HDRS} ${SOURCES} ${PROTO_SRCS} )
34+ cover_add_plugin (Traffic ${HEADERS} ${SOURCES} )
5235
5336target_link_libraries (Traffic
5437 ${EXTRA_LIBS}
5538 ${OSGCAL_LIBRARIES}
56- cppzmq
57- ${PROTO_LIB}
5839)
5940
Load diff This file was deleted.
Load diff This file was deleted.
Load diff This file was deleted.
You can’t perform that action at this time.
0 commit comments