Merged master branch

Former-commit-id: 3bc6400baf

configure.sh

@@ -1,17 +1,16 @@
 #!/bin/bash
 
+if [[ $2 =~ ^[0-9]+$ ]] ; then
+    processes=$2
+else
+    processes=$(nproc)
+fi
+
 install() {
     ## Set up library paths
-
     export PYTHONPATH=$RUNPATH/SuperBuild/install/lib/python2.7/dist-packages:$RUNPATH/SuperBuild/src/opensfm:$PYTHONPATH
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib
 
-    if [[ $2 =~ ^[0-9]+$ ]] ; then
-        processes=$2
-    else
-        processes=$(nproc)
-    fi
-
     ## Before installing
     echo "Updating the system"
     apt-get update

modules/odm_georef/CMakeLists.txt

@@ -12,6 +12,7 @@ find_library(PROJ4_LIBRARY "libproj.so" PATHS "/usr/lib" "/usr/lib/x86_64-linux-
 add_definitions(-Wall -Wextra -Wconversion -pedantic -std=c++11)
 
 # Find pcl at the location specified by PCL_DIR
+find_package(VTK 6.0 REQUIRED)
 find_package(PCL 1.8 HINTS "${PCL_DIR}/share/pcl-1.8")
 
 # Find OpenCV at the default location

modules/odm_meshing/CMakeLists.txt

@@ -0,0 +1,27 @@
+project(odm_meshing)
+cmake_minimum_required(VERSION 2.8)
+
+# Set pcl dir to the input spedified with option -DPCL_DIR="path"
+set(PCL_DIR "PCL_DIR-NOTFOUND" CACHE "PCL_DIR" "Path to the pcl installation directory")
+
+# Add compiler options.
+add_definitions(-Wall -Wextra)
+
+# Find pcl at the location specified by PCL_DIR
+find_package(VTK 6.0 REQUIRED)
+find_package(PCL 1.8 HINTS "${PCL_DIR}/share/pcl-1.8")
+
+# Add the PCL and Eigen include dirs. 
+# Necessary since the PCL_INCLUDE_DIR variable set by find_package is broken.)
+include_directories(${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR})
+include_directories(${EIGEN_ROOT})
+
+# Add source directory
+aux_source_directory("./src" SRC_LIST)
+
+# Add exectuteable
+add_executable(${PROJECT_NAME} ${SRC_LIST})
+
+# Link
+target_link_libraries(odm_meshing ${PCL_COMMON_LIBRARIES} ${PCL_IO_LIBRARIES} ${PCL_SURFACE_LIBRARIES})
+

modules/odm_orthophoto/CMakeLists.txt

@@ -9,6 +9,7 @@ set(OPENCV_DIR "OPENCV_DIR-NOTFOUND" CACHE "OPENCV_DIR" "Path to the OPENCV inst
 add_definitions(-Wall -Wextra)
 
 # Find pcl at the location specified by PCL_DIR
+find_package(VTK 6.0 REQUIRED)
 find_package(PCL 1.8 HINTS "${PCL_DIR}/share/pcl-1.8" REQUIRED)
 
 # Find OpenCV at the default location

modules/odm_slam/CMakeLists.txt

@@ -8,6 +8,7 @@ set(OPENCV_DIR "OPENCV_DIR-NOTFOUND" CACHE "OPENCV_DIR" "Path to the opencv inst
 add_definitions(-Wall -Wextra)
 
 # Find pcl at the location specified by PCL_DIR
+find_package(VTK 6.0 REQUIRED)
 find_package(PCL 1.8 HINTS "${PCL_DIR}/share/pcl-1.8" REQUIRED)
 
 # Find OpenCV at the default location