Fix gitignore being too exclusive, add cuda host compiler to ci confi…

…g, fix node and nodelet mixup in cmake, fix tag detector node compile
umrover · Oct 15, 2023 · d15510a · d15510a
1 parent fc36ce9
commit d15510a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,18 +29,3 @@ moteus-cal*
 
 # CSV
 *.csv
-
-# STM32 workspace
-.metadata
-
-Debug/
-Release/
-.metadata/
-.settings/
-RemoteSystemsTempFiles/
-
-*.chm
-*.settings.xml
-
-*.xml
-*.launch
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -93,9 +93,9 @@ endmacro()
 
 macro(mrover_add_nodelet name sources includes)
     # A nodelet runs inside another process so it is a library
-    mrover_add_library(${name}_node ${sources} ${includes})
+    mrover_add_library(${name}_nodelet ${sources} ${includes})
     # Also add a node for quick debugging
-    mrover_add_node(${name}_nodelet ${sources})
+    mrover_add_node(${name}_node ${sources})
     target_compile_definitions(${name}_nodelet PRIVATE MROVER_IS_NODELET)
     # Optional PCH
     if (ARGV3)

diff --git a/ansible/roles/build/files/profiles/ci/config.yaml b/ansible/roles/build/files/profiles/ci/config.yaml
@@ -8,6 +8,7 @@ cmake_args:
   - -DCMAKE_CXX_FLAGS=-pipe
   - -DCMAKE_CXX_COMPILER=clang++-16
   - -DCMAKE_CXX_CLANG_TIDY=clang-tidy-16
+  - -DCMAKE_CUDA_HOST_COMPILER=clang++-16
   - -Wno-dev
 devel_layout: linked
 devel_space: devel

diff --git a/src/perception/tag_detector/tag_detector.cpp b/src/perception/tag_detector/tag_detector.cpp
@@ -155,5 +155,7 @@ int main(int argc, char** argv) {
     return EXIT_SUCCESS;
 }
 
+#ifdef MROVER_IS_NODELET
 #include <pluginlib/class_list_macros.h>
 PLUGINLIB_EXPORT_CLASS(mrover::TagDetectorNodelet, nodelet::Nodelet)
+#endif