Started modifying cmake build rules to build 25dmesh module

Former-commit-id: 6b8a41499e

configure.sh

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

modules/CMakeLists.txt

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

modules/odm_25dmeshing/CMakeLists.txt

@@ -1,12 +1,14 @@
 project(odm_25dmeshing)
 cmake_minimum_required(VERSION 2.8)
 
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
+
 # Link
-find_package(CGAL QUIET COMPONENTS Core )
+find_package(CGAL COMPONENTS Core )
 
 if ( CGAL_FOUND )
 
-  find_package( Eigen3 QUIET )
+  find_package( Eigen3 )
 
   if( EIGEN3_FOUND )
     include_directories(${EIGEN3_INCLUDE_DIR})

modules/odm_25dmeshing/FindEigen3.cmake

@@ -0,0 +1,84 @@
+# - Try to find Eigen3 lib
+#
+# This module supports requiring a minimum version, e.g. you can do
+#   find_package(Eigen3 3.1.2)
+# to require version 3.1.2 or newer of Eigen3.
+#
+# Once done this will define
+#
+#  EIGEN3_FOUND - system has eigen lib with correct version
+#  EIGEN3_INCLUDE_DIR - the eigen include directory
+#  EIGEN3_VERSION - eigen version
+
+# Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
+# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
+# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com>
+# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
+
+include(FindPackageHandleStandardArgs)
+
+if(NOT Eigen3_FIND_VERSION)
+  if(NOT Eigen3_FIND_VERSION_MAJOR)
+    set(Eigen3_FIND_VERSION_MAJOR 2)
+  endif(NOT Eigen3_FIND_VERSION_MAJOR)
+  if(NOT Eigen3_FIND_VERSION_MINOR)
+    set(Eigen3_FIND_VERSION_MINOR 91)
+  endif(NOT Eigen3_FIND_VERSION_MINOR)
+  if(NOT Eigen3_FIND_VERSION_PATCH)
+    set(Eigen3_FIND_VERSION_PATCH 0)
+  endif(NOT Eigen3_FIND_VERSION_PATCH)
+
+  set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
+endif(NOT Eigen3_FIND_VERSION)
+
+macro(_eigen3_get_version)
+  file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
+
+  string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
+  set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
+  set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}")
+  set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
+
+  set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
+endmacro(_eigen3_get_version)
+
+if (EIGEN3_INCLUDE_DIR)
+
+  if (EXISTS ${EIGEN3_INCLUDE_DIR}/signature_of_eigen3_matrix_library)
+    # in cache already and valid
+    _eigen3_get_version()
+    set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
+
+    find_package_handle_standard_args(Eigen3 
+      REQUIRED_VARS EIGEN3_INCLUDE_DIR
+      VERSION_VAR EIGEN3_VERSION)
+
+  else()
+    message(STATUS "Eigen3 path specified in cmake variable EIGEN3_INCLUDE_DIR is "
+                    "set to ${EIGEN3_INCLUDE_DIR}, but that path does not contains the file "
+                    "signature_of_eigen3_matrix_library and is considered as invalid.")
+  endif()
+
+
+
+else (EIGEN3_INCLUDE_DIR)
+
+  find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
+      HINTS ENV EIGEN3_INC_DIR
+            ENV EIGEN3_DIR
+      PATHS ${KDE4_INCLUDE_DIR}
+      PATH_SUFFIXES include eigen3 eigen
+      DOC "Directory containing the Eigen3 header files"
+    )
+
+  if(EIGEN3_INCLUDE_DIR)
+    _eigen3_get_version()
+  endif(EIGEN3_INCLUDE_DIR)
+
+  find_package_handle_standard_args(Eigen3 
+    REQUIRED_VARS EIGEN3_INCLUDE_DIR
+    VERSION_VAR EIGEN3_VERSION)
+
+endif(EIGEN3_INCLUDE_DIR)