Got odm_25dmeshing to compile under OpenDroneMap env

Former-commit-id: 4cef227a64

SuperBuild/CMakeLists.txt

@@ -90,6 +90,15 @@ option(ODM_BUILD_Ceres "Force to build Ceres library" OFF)
 SETUP_EXTERNAL_PROJECT(Ceres ${ODM_Ceres_Version} ${ODM_BUILD_Ceres})
 
 
+# ---------------------------------------------------------------------------------------------
+# CGAL
+#
+set(ODM_CGAL_Version 4.9)
+option(ODM_BUILD_CGAL "Force to build CGAL library" OFF)
+
+SETUP_EXTERNAL_PROJECT(CGAL ${ODM_CGAL_Version} ${ODM_BUILD_CGAL})
+
+
 # ---------------------------------------------------------------------------------------------
 # Open Geometric Vision (OpenGV)
 # Open Structure from Motion (OpenSfM)

SuperBuild/cmake/External-CGAL.cmake

@@ -0,0 +1,26 @@
+set(_proj_name cgal)
+set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
+
+ExternalProject_Add(${_proj_name}
+  PREFIX            ${_SB_BINARY_DIR}
+  TMP_DIR           ${_SB_BINARY_DIR}/tmp
+  STAMP_DIR         ${_SB_BINARY_DIR}/stamp
+  #--Download step--------------
+  DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}/${_proj_name}
+  URL               https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.9/CGAL-4.9.zip
+  URL_MD5           31c08d762a72fda785df194c89b833df
+  #--Update/Patch step----------
+  UPDATE_COMMAND    ""
+  #--Configure step-------------
+  SOURCE_DIR        ${SB_SOURCE_DIR}/${_proj_name}
+  CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
+  #--Build step-----------------
+  BINARY_DIR        ${_SB_BINARY_DIR}
+  #--Install step---------------
+  INSTALL_DIR       ${SB_INSTALL_DIR}
+  #--Output logging-------------
+  LOG_DOWNLOAD      OFF
+  LOG_CONFIGURE     OFF
+  LOG_BUILD         OFF
+)

configure.sh

@@ -20,8 +20,7 @@ sudo apt-get install -y -qq build-essential \
                      libgdal-dev \
                      gdal-bin \
                      libgeotiff-dev \
-                     pkg-config \
-                     libcgal-dev
+                     pkg-config
 
 echo "Getting CMake 3.1 for MVS-Texturing"
 sudo apt-get install -y software-properties-common python-software-properties

modules/CMakeLists.txt

@@ -4,7 +4,7 @@ add_subdirectory(odm_georef)
 add_subdirectory(odm_meshing)
 add_subdirectory(odm_orthophoto)
 add_subdirectory(odm_texturing)
-add_subdirectory(odm_25dmeshing)
+#add_subdirectory(odm_25dmeshing)
 if (ODM_BUILD_SLAM)
   add_subdirectory(odm_slam)
 endif ()

modules/odm_25dmeshing/CMakeLists.txt

@@ -3,8 +3,11 @@ cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
 
+# Set pcl dir to the input spedified with option -DCGAL_DIR="path"
+set(CGAL_DIR "CGAL_DIR-NOTFOUND" CACHE "CGAL_DIR" "Path to the CGAL installation directory")
+
 # Link
-find_package(CGAL COMPONENTS Core )
+find_package(CGAL COMPONENTS Core HINTS "${CGAL_DIR}")
 
 if ( CGAL_FOUND )
 
@@ -20,7 +23,7 @@ if ( CGAL_FOUND )
   include( ${CGAL_USE_FILE} )
 
   # Add compiler options.
-  add_definitions(-Wall -Wextra)
+  add_definitions(-Wall -Wextra -std=c++11)
 	
   # Add source directory
   aux_source_directory("./src" SRC_LIST)