fixed compilation for optional embree

uos · Feb 1, 2024 · d53d587 · d53d587
1 parent 85d1e6d
commit d53d587
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.2...10.0)
 project(rmcl
-	VERSION 1.1.4
+	VERSION 1.1.5
 	)
 
 option(BUILD_EXAMPLES "Build Examples" OFF)
@@ -677,20 +677,23 @@ if(RMCL_OPTIX)
 
 endif(RMCL_OPTIX)
 
-
 # BENCHMARKS
-add_executable(rmcl_correction_embree_benchmark
-    src/nodes/benchmarks/lidar_corrector_embree_benchmark.cpp
-)
+if(RMCL_EMBREE)
+
+    add_executable(rmcl_correction_embree_benchmark
+        src/nodes/benchmarks/lidar_corrector_embree_benchmark.cpp
+    )
 
-target_link_libraries(rmcl_correction_embree_benchmark
-    rmcl_embree
-)
+    target_link_libraries(rmcl_correction_embree_benchmark
+        rmcl_embree
+    )
+
+endif(RMCL_EMBREE)
 
 # add_executable(rmcl_correction_optix_benchmark
 #     src/nodes/lidar_corrector_optix_benchmark.cpp
 # )
 
 # target_link_libraries(rmcl_correction_optix_benchmark
 #     rmcl_optix
-# )
+# )
diff --git a/include/rmcl/correction/PinholeCorrectorOptixROS.hpp b/include/rmcl/correction/PinholeCorrectorOptixROS.hpp
@@ -49,7 +49,7 @@
 #include <geometry_msgs/PoseStamped.h>
 
 // Rmagine deps
-#include <rmagine/map/EmbreeMap.hpp>
+#include <rmagine/map/OptixMap.hpp>
 
 // Internal deps
 #include "PinholeCorrectorOptix.hpp"

diff --git a/include/rmcl/correction/SphereCorrectorOptixROS.hpp b/include/rmcl/correction/SphereCorrectorOptixROS.hpp
@@ -49,7 +49,7 @@
 #include <geometry_msgs/PoseStamped.h>
 
 // Rmagine deps
-#include <rmagine/map/EmbreeMap.hpp>
+#include <rmagine/map/OptixMap.hpp>
 
 // Internal deps
 #include "SphereCorrectorOptix.hpp"

diff --git a/package.xml b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>rmcl</name>
-    <version>1.0.0</version>
+    <version>1.1.5</version>
     <description>The rmcl package</description>
 
     <maintainer email="[email protected]">Alexander Mock</maintainer>
@@ -34,4 +34,4 @@
     <exec_depend>visualization_msgs</exec_depend>
     <depend>rmagine</depend>
 
-</package>
+</package>