Merge pull request #51 from JustusBraun/main

Reduce DEB dependencies to what is needed

Author: amock

CMakeLists.txt

@@ -138,9 +138,10 @@ include_directories(${GDAL_INCLUDE_DIR})
 #------------------------------------------------------------------------------
 # Searching for OpenCV
 #------------------------------------------------------------------------------
-find_package( OpenCV 3 QUIET )
+set(OPEN_CV_COMPONENTS "core;imgproc;imgcodecs;features2d;calib3d")
+find_package( OpenCV 3 QUIET COMPONENTS ${OPEN_CV_COMPONENTS} )
 if (NOT OpenCV_FOUND)
-  find_package( OpenCV 4)
+  find_package( OpenCV 4 COMPONENTS ${OPEN_CV_COMPONENTS})
   if(OpenCV_FOUND)
 	message(STATUS "Found OpenCV 4")
   endif()
@@ -378,24 +379,6 @@ if(WITH_PCL)
     endif(PCL_FOUND)
 endif(WITH_PCL)
 
-#------------------------------------------------------------------------------
-# Searching CGAL
-#------------------------------------------------------------------------------
-set(CGAL_DATA_DIR ".")
-find_package(CGAL)
-if(CGAL_FOUND)
-  
-  if(DEFINED CGAL_USE_FILE)
-    # CGAL_USE_FILE overrides theses flags...
-    set(_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-    set(CMAKE_CXX_FLAGS)
-    include(${CGAL_USE_FILE})
-    set(CMAKE_CXX_FLAGS "${_CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
-  endif()
-
-  message(STATUS "Found CGAL")
-endif(CGAL_FOUND)
-
 #------------------------------------------------------------------------------
 # Searching for OpenMP
 #------------------------------------------------------------------------------

CMakeModules/lvr2-packaging.cmake

@@ -42,25 +42,32 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "jubraun@uos.de")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 
 set(_LVR2_DEPS
-    libboost-all-dev
+    libboost-program-options-dev
+    libboost-filesystem-dev
+    libboost-thread-dev
+    libboost-serialization-dev
+    libboost-timer-dev
+    libboost-iostreams-dev
+    libboost-date-time-dev
     libflann-dev
     libgsl-dev
     libeigen3-dev
     libopenmpi-dev
+    libopencv-core-dev
+    libopencv-imgproc-dev
+    libopencv-imgcodecs-dev
+    libopencv-features2d-dev
+    libopencv-calib3d-dev
     openmpi-bin
     ocl-icd-opencl-dev
-    freeglut3-dev
     libhdf5-dev
     liblz4-dev
-    libopencv-dev
     libyaml-cpp-dev
-    libcgal-dev
-    libgdal-dev
 )
 
 # Convert list → comma-separated string
 string(REPLACE ";" ", " _LVR2_DEPS_STR "${_LVR2_DEPS}")
 
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "${_LVR2_DEPS_STR}")
 
-include(CPack)
+include(CPack)

include/lvr2/algorithm/RaycastingTexturizer.tcc

@@ -8,7 +8,6 @@
 // opencv includes
 #include <opencv2/imgproc.hpp>
 #include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
 
 // std includes
 #include <fstream>

include/lvr2/algorithm/Texturizer.tcc

@@ -36,7 +36,6 @@
 #include "lvr2/util/Logging.hpp"
 #include "lvr2/algorithm/ColorAlgorithms.hpp"
 
-#include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
 
 

include/lvr2/io/modelio/GeoTIFFIO.hpp

@@ -27,10 +27,16 @@
 #ifndef GEOTIFFIO_HPP
 #define GEOTIFFIO_HPP
 
-#include <gdal_priv.h>
 #include <opencv2/opencv.hpp>
 #include <string>
 
+// Forward declaration to remove <gdal_priv.h> include
+extern "C"
+{
+    struct GDALDataset;
+    struct GDALDriver;
+}
+
 namespace lvr2
 {
 /**

src/liblvr2/io/modelio/GeoTIFFIO.cpp

@@ -7,6 +7,8 @@
 #include "lvr2/io/modelio/GeoTIFFIO.hpp"
 #include "lvr2/util/Timestamp.hpp"
 
+#include <gdal_priv.h>
+
 namespace lvr2
 {
 

src/tools/lvr2_ascii_viewer/include/ascii_viewer/AsciiRenderer.hpp

@@ -11,7 +11,7 @@
 
 #include "CursesHelper.hpp"
 
-#include <embree3/rtcore.h>
+#include <embree4/rtcore.h>
 #include <memory>
 
 namespace lvr2 {
@@ -74,7 +74,6 @@ class AsciiRenderer {
 
     RTCDevice m_device;
     RTCScene m_scene;
-    RTCIntersectContext m_context;
 
     // Camera
     Eigen::Affine3d m_camera;

src/tools/lvr2_ascii_viewer/src/ascii_viewer/AsciiRenderer.cpp

@@ -91,7 +91,6 @@ void AsciiRenderer::initEmbree(MeshBufferPtr mesh)
 {
     m_device = initializeDevice();
     m_scene = initializeScene(m_device, mesh);
-    rtcInitIntersectContext(&m_context);
 }
 
 RTCDevice AsciiRenderer::initializeDevice()
@@ -238,7 +237,7 @@ void AsciiRenderer::raycast()
             rayhit.ray.dir_z = dir.coeff(2);
 
 
-            rtcIntersect1(m_scene, &m_context, &rayhit);
+            rtcIntersect1(m_scene, &rayhit);
 
             if(rayhit.hit.geomID != RTC_INVALID_GEOMETRY_ID)
             {

src/tools/lvr2_hdf5_builder/HDF5Tool.cpp

@@ -57,7 +57,6 @@
 #include <boost/filesystem.hpp>
 
 #include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
 
 using namespace lvr2;
 using boost::filesystem::path;