Fix compilation errors

usdot-fhwa-stol · Apr 17, 2023 · d32c6e4 · d32c6e4
1 parent dbd1dce
commit d32c6e4
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 36 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -6,11 +6,7 @@
 # Ignore VS Code project files for Docker build context
 .vscode
 # Ignore Dockerfiles for Docker build context
-/intersection_model/Dockerfile
-/message_services/Dockerfile
-/scheduling_service/Dockerfile
-/tsc_client_service/Dockerfile
-/signal_opt_service/Dockerfile
+**/Dockerfile
 # Ignore any documentation for Docker build context
 /docs
 # Ignore any examples for Docker build context
@@ -20,29 +16,9 @@
 # Ignore any testing scripts for Docker build context
 /scripts
 # Ignore all local build files for Docker build context
-/kafka_clients/build
-/scheduling_service/build
-/message_services/build
-/signal_opt_service/build
-/intersection_model/build
-/tsc_client_service/build
-/scheduling_service/build
-/streets_utils/streets_service_base/build
-/streets_utils/streets_service_configuration/build
-/streets_utils/streets_vehicle_list/build
-/streets_utils/streets_vehicle_scheduler/build
-/streets_utils/streets_api/intersection_client_api/build
-/streets_utils/streets_api/intersection_server_api/build
-/streets_utils/streets_signal_phase_and_timing/build
-/streets_utils/streets_desired_phase_plan/build
-/streets_utils/streets_signal_optimization/build
-/streets_utils/streets_tsc_configuration/build
+**/build/
 # Ignore all local log files for Docker build context
-/message_services/logs
-/signal_opt_service/logs
-/intersection_model/logs
-/tsc_client_service/logs
-/scheduling_service/logs
+**/logs/
 # Ignore local external cloned repos for Docker build context
 /carma_lanelet2
 /intersection_model/src/server/external/lib/pkgconfig/qhttpengine.pc

diff --git a/scheduling_service/CMakeLists.txt b/scheduling_service/CMakeLists.txt
@@ -12,7 +12,8 @@ find_package(Boost COMPONENTS thread filesystem system REQUIRED)
 find_package(spdlog REQUIRED)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Network REQUIRED)
-find_package(streets_service_base_lib COMPONENTS streets_service_base_lib REQUIRED)
+find_package(streets_service_configuration_lib REQUIRED)
+find_package(streets_service_base_lib REQUIRED)
 find_package(streets_vehicle_list_lib REQUIRED)
 find_package(streets_vehicle_scheduler_lib REQUIRED)
 find_package(streets_signal_phase_and_timing_lib REQUIRED)
@@ -32,14 +33,15 @@ add_executable(${PROJECT_NAME}  src/main.cpp
 target_include_directories( ${PROJECT_NAME} PUBLIC
                             ${PROJECT_SOURCE_DIR}/include)
 
-target_link_libraries(${PROJECT_NAME} PUBLIC 
+target_link_libraries(${PROJECT_NAME} PUBLIC
+    streets_service_configuration_lib::streets_service_configuration_lib
+    streets_service_base_lib::streets_service_base_lib
     kafka_clients_lib 
     rdkafka++ 
     Boost::system Boost::filesystem 
     Boost::thread spdlog::spdlog 
     intersection_client_api_lib 
-    ::carma-clock
-    streets_service_base_lib::streets_service_base_lib 
+    ::carma-clock  
     streets_vehicle_list_lib::streets_vehicle_list_lib 
     streets_vehicle_scheduler_lib::streets_vehicle_scheduler_lib)
 target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core Qt5::Network )
@@ -58,4 +60,9 @@ add_executable(${BINARY} ${TEST_SOURCES}
                         src/scheduling_worker.cpp )
 add_test(NAME ${BINARY} COMMAND ${BINARY})
 target_include_directories(${BINARY} PUBLIC ${PROJECT_SOURCE_DIR}/include)
-target_link_libraries(${BINARY} PUBLIC  Boost::system Boost::filesystem kafka_clients_lib rdkafka++ Boost::thread spdlog::spdlog gtest intersection_client_api_lib Qt5::Core Qt5::Network streets_service_base_lib::streets_service_base_lib streets_vehicle_list_lib::streets_vehicle_list_lib streets_vehicle_scheduler_lib::streets_vehicle_scheduler_lib streets_signal_phase_and_timing_lib::streets_signal_phase_and_timing_lib)    
+target_link_libraries(${BINARY} 
+    PUBLIC  
+        Boost::system 
+        Boost::filesystem 
+        kafka_clients_lib::kafka_clients_lib 
+        rdkafka++ Boost::thread spdlog::spdlog gtest intersection_client_api_lib Qt5::Core Qt5::Network streets_service_base_lib::streets_service_base_lib streets_vehicle_list_lib::streets_vehicle_list_lib streets_vehicle_scheduler_lib::streets_vehicle_scheduler_lib streets_signal_phase_and_timing_lib::streets_signal_phase_and_timing_lib)    
diff --git a/scheduling_service/Dockerfile b/scheduling_service/Dockerfile
@@ -39,6 +39,16 @@ RUN make
 RUN make install
 
 COPY ./streets_utils/ /home/carma-streets/streets_utils
+
+# Install streets_service_configuration
+RUN echo " ------> Install streets service configuration library from streets_utils..."
+WORKDIR /home/carma-streets/streets_utils/streets_service_configuration
+RUN mkdir build
+WORKDIR /home/carma-streets/streets_utils/streets_service_configuration/build
+RUN cmake -DCMAKE_BUILD_TYPE="Debug" ..
+RUN make
+RUN make install
+
 # Install streets_service_base
 RUN echo " ------> Install streets service base library from streets_utils..."
 WORKDIR /home/carma-streets/streets_utils/streets_service_base
@@ -49,6 +59,7 @@ RUN make
 RUN make install
 
 
+
 # Install intersection_client
 RUN echo " ------> Install intersection client library from streets_utils..."
 WORKDIR  /home/carma-streets/streets_utils/streets_api/intersection_client_api

diff --git a/streets_utils/streets_service_configuration/include/internal/streets_singleton.tpp b/streets_utils/streets_service_configuration/include/internal/streets_singleton.tpp
@@ -35,5 +35,7 @@ namespace streets_service {
      * Protected destructor
      */ 
     template <typename T, typename... Args>   
-    streets_singleton<T,Args...>::~streets_singleton() = default; 
+    streets_singleton<T,Args...>::~streets_singleton() {
+      delete instance;
+    }; 
 }
diff --git a/streets_utils/streets_service_configuration/include/streets_singleton.h b/streets_utils/streets_service_configuration/include/streets_singleton.h
@@ -30,7 +30,13 @@ namespace streets_service {
             streets_singleton& operator=(const streets_singleton &) = delete;
             // Remove move assignment operator
             streets_singleton& operator=(const streets_singleton &&) = delete;
-
+            /**
+             * @brief Method to intialize streets_singleton with constructor params
+             * ...Args of templated class.
+             * 
+             * @param ...args constructor parameters of templated class.
+             * @return returns reference to singleton instance.
+             */
             static T& create(Args...args );
 
 

diff --git a/streets_utils/streets_signal_optimization/CMakeLists.txt b/streets_utils/streets_signal_optimization/CMakeLists.txt
@@ -14,6 +14,9 @@ find_package(streets_signal_phase_and_timing_lib REQUIRED)
 find_package(streets_vehicle_scheduler_lib REQUIRED)
 find_package(streets_tsc_configuration_lib REQUIRED)
 find_package(GTest REQUIRED)
+# carma-clock is installed under this directory
+list(APPEND CMAKE_PREFIX_PATH "/opt/carma/cmake/")
+find_package(carma-clock REQUIRED)
 
 ########################################################
 # Build Library
@@ -36,7 +39,8 @@ target_link_libraries(${PROJECT_NAME}_lib
         streets_vehicle_scheduler_lib::streets_vehicle_scheduler_lib
         streets_tsc_configuration_lib::streets_tsc_configuration_lib
         spdlog::spdlog
-        intersection_client_api_lib        
+        intersection_client_api_lib 
+        ::carma-clock       
 )
 
 # #######################################################

diff --git a/streets_utils/streets_vehicle_scheduler/CMakeLists.txt b/streets_utils/streets_vehicle_scheduler/CMakeLists.txt
@@ -14,6 +14,9 @@ find_package(streets_signal_phase_and_timing_lib REQUIRED)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Network REQUIRED)
 find_package(Boost COMPONENTS thread)
+# carma-clock is installed under this directory
+list(APPEND CMAKE_PREFIX_PATH "/opt/carma/cmake/")
+find_package(carma-clock REQUIRED)
 
 ########################################################
 # Build Library
@@ -28,7 +31,8 @@ target_link_libraries(${PROJECT_NAME}_lib
         Qt5::Network 
         intersection_client_api_lib
         streets_vehicle_list_lib::streets_vehicle_list_lib
-        streets_signal_phase_and_timing_lib::streets_signal_phase_and_timing_lib 
+        streets_signal_phase_and_timing_lib::streets_signal_phase_and_timing_lib
+        ::carma-clock
 )
 target_include_directories(${PROJECT_NAME}_lib 
     PUBLIC