Disable voxelOccupancyDetection by default, request C compiler

roboticslab-uc3m · Jul 19, 2024 · ca77353 · ca77353
1 parent 64d59fd
commit ca77353
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(ROBOTICSLAB_VISION LANGUAGES CXX)
+# 'C' required by prograns/voxelOccupancyDetection in Ubuntu 24.04
+# see https://github.com/roboticslab-uc3m/vision/issues/106
+project(ROBOTICSLAB_VISION LANGUAGES C CXX)
 
 # Set CMake policies.
 if(POLICY CMP0127)

diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright: Universidad Carlos III de Madrid (C) 2015
-# Authors: Juan G. Victores
-
 #add_subdirectory(pointAtObjectServer) # see https://github.com/roboticslab-uc3m/vision/issues/106
 add_subdirectory(sceneReconstruction)
 add_subdirectory(rgbDetection)

diff --git a/programs/sceneReconstruction/CMakeLists.txt b/programs/sceneReconstruction/CMakeLists.txt
@@ -16,7 +16,6 @@ cmake_dependent_option(ENABLE_sceneReconstruction "Enable/disable sceneReconstru
 
 if(ENABLE_sceneReconstruction)
 
-    # sceneReconstruction
     add_executable(sceneReconstruction main.cpp
                                        SceneReconstruction.hpp
                                        SceneReconstruction.cpp

diff --git a/programs/voxelOccupancyDetection/CMakeLists.txt b/programs/voxelOccupancyDetection/CMakeLists.txt
@@ -1,18 +1,19 @@
-option(ENABLE_voxelOccupancyDetection "Enable/disable voxelOccupancyDetection program" ON)
+# disabled, see https://github.com/roboticslab-uc3m/vision/issues/106
+option(ENABLE_voxelOccupancyDetection "Enable/disable voxelOccupancyDetection program" OFF)
 
 if(ENABLE_voxelOccupancyDetection)
 
-add_executable(voxelOccupancyDetection main.cpp
-                                       VoxelOccupancyDetection.hpp
-                                       VoxelOccupancyDetection.cpp
-                                       SegmentorThread.hpp
-                                       SegmentorThread.cpp)
+    add_executable(voxelOccupancyDetection main.cpp
+                                           VoxelOccupancyDetection.hpp
+                                           VoxelOccupancyDetection.cpp
+                                           SegmentorThread.hpp
+                                           SegmentorThread.cpp)
 
-target_link_libraries(voxelOccupancyDetection YARP::YARP_os
-                                              YARP::YARP_init
-                                              YARP::YARP_dev
-                                              YARP::YARP_sig)
+    target_link_libraries(voxelOccupancyDetection YARP::YARP_os
+                                                  YARP::YARP_init
+                                                  YARP::YARP_dev
+                                                  YARP::YARP_sig)
 
-install(TARGETS voxelOccupancyDetection)
+    install(TARGETS voxelOccupancyDetection)
 
 endif()