From e8d495bd9a1549d7c29c4e6afbcef303ac08e5f3 Mon Sep 17 00:00:00 2001
From: Alex Hagiopol <alexhagiopol@gmail.com>
Date: Fri, 22 Jul 2016 11:05:29 -0700
Subject: [PATCH] CMake fix & tell people to edit bashrc manually.

---
 README.md           | 12 +++++++++++-
 configure.sh        | 13 ++-----------
 packages.Dockerfile |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 52bf2388..9dade07a 100644
--- a/README.md
+++ b/README.md
@@ -42,12 +42,22 @@ Help improve our software!
 Support for Ubuntu 12.04 is currently BROKEN with the addition of OpenSfM and Ceres-Solver. We are working hard to get it working again in the future.
 
 ### Build OpenDroneMap
+Start with the following:
 
     git clone https://github.com/OpenDroneMap/OpenDroneMap.git
+    
+Next, open the ~/.bashrc file on your machine and add the following 3 lines at the end. The file can be opened with ```gedit ~/.bashrc```. Be sure to replace the "/your/path/" with the correct path to the location where you cloned OpenDroneMap:
+
+    export PYTHONPATH=$PYTHONPATH:/your/path/OpenDroneMap/SuperBuild/install/lib/python2.7/dist-packages
+    export PYTHONPATH=$PYTHONPATH:/your/path/OpenDroneMap/SuperBuild/src/opensfm
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/your/path/OpenDroneMap/SuperBuild/install/lib
+
+Now, enter the OpenDroneMap directory and compile all of the code by executing a single configuration script:
+
     cd OpenDroneMap    
     bash configure.sh
 
- For Ubuntu 15.10 users, this will help you get running:
+For Ubuntu 15.10 users, this will help you get running:
 
     sudo apt-get install python-xmltodict
     sudo ln -s /usr/lib/x86_64-linux-gnu/libproj.so.9 /usr/lib/libproj.so
diff --git a/configure.sh b/configure.sh
index 0508c768..3aeeda5c 100755
--- a/configure.sh
+++ b/configure.sh
@@ -1,14 +1,5 @@
 #!/bin/bash
 
-#Add necessary paths. Also add to .bashrc
-echo "Adding library paths to ~/.bashrc"
-export PYTHONPATH=$PYTHONPATH:$(pwd)/SuperBuild/install/lib/python2.7/dist-packages
-export PYTHONPATH=$PYTHONPATH:$(pwd)/SuperBuild/src/opensfm
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/SuperBuild/install/lib
-echo 'export PYTHONPATH=$PYTHONPATH:$(pwd)/SuperBuild/install/lib/python2.7/dist-packages' >> ~/.bashrc
-echo 'export PYTHONPATH=$PYTHONPATH:$(pwd)/SuperBuild/src/opensfm' >> ~/.bashrc
-echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/SuperBuild/install/lib' >> ~/.bashrc
-
 ## Before installing
 echo "Updating the system"
 sudo apt-get update
@@ -24,9 +15,9 @@ sudo apt-get install -y -qq build-essential \
 
 echo "Getting CMake 3.1 for MVS-Texturing"
 sudo apt-get install -y software-properties-common python-software-properties
-sudo add-apt-repository ppa:george-edison55/cmake-3.x -y
+sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
 sudo apt-get update -y
-sudo apt-get install cmake -y
+sudo apt-get install -y --only-upgrade cmake
 
 echo "Installing OpenCV Dependencies"
 sudo apt-get install -y -qq libgtk2.0-dev \
diff --git a/packages.Dockerfile b/packages.Dockerfile
index a6a9e5f8..618ceb82 100644
--- a/packages.Dockerfile
+++ b/packages.Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get update \
 RUN sudo apt-get install -y software-properties-common python-software-properties
 RUN sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
 RUN sudo apt-get update -y
-RUN sudo apt-get install cmake -y
+RUN sudo apt-get install -y --only-upgrade cmake
 
 #Installing OpenCV Dependencies
 RUN sudo apt-get install -y -qq libgtk2.0-dev \