traci: adding cmake configs for traci

Author: AshFungor

src/traci/CMakeLists.txt

@@ -1,41 +1,39 @@
-add_library(traci SHARED 
-    Defs.cc
-    API.cc
-    BasicModuleMapper.cc
-    BasicNodeManager.cc
-    BasicSubscriptionManager.cc
-    CheckTimeSync.cc
-    Core.cc
-    launchers/ConnectLauncher.cc
-    launchers/PosixLauncher.cc
-    ExtensibleNodeManager.cc
-    InsertionDelayVehiclePolicy.cc
-    Listener.cc
-    MultiTypeModuleMapper.cc
-    RegionsOfInterest.cc
-    RegionOfInterestVehiclePolicy.cc
-    TestbedModuleMapper.cc
-    TestbedNodeManager.cc
-    ValueUtils.cc
-    VariableCache.cc
-)
+###########
+# Helpers #
+###########
+
+# Add a static library to traci component. This macro
+# adds static library to scope, sets include directory
+# and adds LIBTRACI compile definition. 
+macro(add_traci_component name)
+    add_library(${name} STATIC ${ARGN})
+    target_include_directories(${name} PUBLIC ${CMAKE_SOURCE_DIR}/src)
+
+    if(WITH_LIBTRACI)
+        target_compile_definitions(${name} PUBLIC LIBTRACI)
+    endif()
+    target_link_libraries(traci PRIVATE ${name})
+endmacro()
 
-target_link_libraries(traci PUBLIC OmnetPP::envir)
-target_include_directories(traci PUBLIC ${CMAKE_SOURCE_DIR}/src)
+#########
+# TraCI #
+#########
 
-if(WITH_LIBTRACI)
-    target_compile_definitions(traci PUBLIC LIBTRACI)
-endif()
+add_library(traci SHARED)
+
+# Common code for other components goes here.
+add_traci_component(traci_common
+    Defs.cc
+)
 
 set_target_properties(traci PROPERTIES
     NED_FOLDERS ${CMAKE_CURRENT_SOURCE_DIR}
     OMNETPP_LIBRARY ON
 )
 
 install(TARGETS traci LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${CMAKE_INSTALL_DATADIR}/ned/traci FILES_MATCHING PATTERN "*.ned")
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_DATADIR}/ned/traci FILES_MATCHING PATTERN "*.ned")
 
 set_property(TARGET traci APPEND PROPERTY INSTALL_NED_FOLDERS ${CMAKE_INSTALL_DATADIR}/ned/traci)
 
-# traci library uses inet/common/ModuleAccess.h
-add_dependencies(traci INET)
+add_subdirectory(launchers)

src/traci/Core.h

@@ -1,46 +1,47 @@
-#ifndef CORE_H_HPQGM1MF
-#define CORE_H_HPQGM1MF
+#pragma once
+
+#include <memory>
 
 #include <omnetpp/cmessage.h>
 #include <omnetpp/csimplemodule.h>
 #include <omnetpp/simtime.h>
-#include <memory>
 
-namespace traci
-{
+#include <traci/API.h>
+#include <traci/launchers/Launcher.h>
+
+namespace artery {
+
+    namespace traci {
 
-class API;
-class Launcher;
-class LiteAPI;
-class SubscriptionManager;
+        class SubscriptionManager;
 
-class Core : public omnetpp::cSimpleModule
-{
-public:
-    Core();
-    virtual ~Core();
+        class Core : public omnetpp::cSimpleModule
+        {
+        public:
+            Core();
+            virtual ~Core();
 
-    void initialize() override;
-    void finish() override;
-    void handleMessage(omnetpp::cMessage*) override;
-    std::shared_ptr<API> getAPI();
+            void initialize() override;
+            void finish() override;
+            void handleMessage(omnetpp::cMessage*) override;
+            std::shared_ptr<API> getAPI();
 
-protected:
-    virtual void checkVersion();
-    virtual void syncTime();
+        protected:
+            virtual void checkVersion();
+            virtual void syncTime();
 
-private:
-    omnetpp::cMessage* m_connectEvent;
-    omnetpp::cMessage* m_updateEvent;
-    omnetpp::SimTime m_updateInterval;
+        private:
+            omnetpp::cMessage* m_connectEvent;
+            omnetpp::cMessage* m_updateEvent;
+            omnetpp::SimTime m_updateInterval;
 
-    Launcher* m_launcher;
-    std::shared_ptr<API> m_traci;
-    bool m_stopping;
-    SubscriptionManager* m_subscriptions;
-};
+            ILauncher* m_launcher;
+            std::shared_ptr<API> m_traci;
+            bool m_stopping;
+            SubscriptionManager* m_subscriptions;
+        };
 
-} // namespace traci
+    } // namespace traci
 
-#endif /* CORE_H_HPQGM1MF */
+}
 

src/traci/Position.h

@@ -0,0 +1,6 @@
+add_traci_component(traci_launchers
+    ConnectLauncher.cc
+    PosixLauncher.cc
+)
+
+