Merge pull request #14 from tim-devereux/docker

Updating DockerFile and CMakeLists.txt

Author: thomas-lowe

CMakeLists.txt

@@ -75,6 +75,7 @@ if(WITH_QHULL)
 endif(WITH_QHULL)
 if(WITH_TIFF)
   find_package(GeoTIFF REQUIRED)
+  find_package(PROJ REQUIRED COMPONENTS proj)
   list(APPEND RAYTOOLS_INCLUDE ${GEOTIFF_INCLUDE_DIR})
   list(APPEND RAYTOOLS_LINK ${GEOTIFF_LIBRARIES})
   find_package(TIFF REQUIRED)

docker/Dockerfile

@@ -12,36 +12,43 @@ RUN cd /home && \
     git checkout tags/1.0.7 && \
     mkdir build && cd build && \
     cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo && \
-    make && make install
+    make -j$(nproc) && make install
 
 RUN cd /home && \
     git clone https://github.com/LASzip/LASzip.git && \
     cd LASzip && \
     git checkout tags/2.0.1 && \
     mkdir build && cd build && \ 
     cmake .. && \
-    make && make install
+    make -j$(nproc) && make install
 
 RUN cd /home && \
     git clone https://github.com/libLAS/libLAS.git && \
     cd libLAS && \ 
     mkdir build && cd build && \
-    cmake .. -DWITH_LASZIP=ON -DWITH_GEOTIFF=OFF && \
-    make && make install
+    cmake .. -DWITH_LASZIP=ON -DWITH_GEOTIFF=OFF -DCMAKE_CXX_STANDARD=11 && \
+    make -j$(nproc) && make install
 
 RUN cd /home && \
     git clone http://github.com/qhull/qhull.git && \
     cd qhull && \
     git checkout tags/v7.3.2 && \
     mkdir -p build && cd build && \
     cmake .. -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true && \
-    make && make install
+    make -j$(nproc) && make install
 
 RUN cd /home && \
     git clone https://github.com/csiro-robotics/raycloudtools.git && \
     cd raycloudtools && \
     mkdir build && cd build && \
-    cmake .. -DGEOTIFF_INCLUDE_DIR=/usr/include/geotiff -DGEOTIFF_LIBRARIES=/usr/lib/libgeotiff.so -DWITH_QHULL=ON -DWITH_LAS=ON -DWITH_TIFF=ON -DRAYCLOUD_BUILD_TESTS=ON && \
-    make && make install
+    cmake .. -DGEOTIFF_LIBRARIES=/usr/lib/libgeotiff.so -DWITH_QHULL=ON -DWITH_LAS=ON -DWITH_TIFF=ON -DRAYCLOUD_BUILD_TESTS=ON && \
+    make -j$(nproc) && make install 
+        
+RUN cd /home && \
+    git clone https://github.com/csiro-robotics/treetools.git && \
+    cd treetools && \
+    mkdir build && cd build && \
+    cmake .. && \
+    make -j$(nproc) && make install
 
-WORKDIR /data
+WORKDIR /data