Update for new version

johntfoster · Apr 21, 2015 · 30ee413 · 30ee413
1 parent 5f8f63e
commit 30ee413
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,18 +9,25 @@ RUN apt-get -yq install g++ \
                         python \ 
                         libblas-dev \
                         liblapack-dev \
-                        libboost-dev \
-                        libopenmpi-dev \
-                        cmake
+                        libboost-dev
+
+#Get modern cmake
+RUN wget http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz; \
+    tar xzvf cmake-3.2.2.tar.gz; \
+    cd cmake-3.2.2; \
+    ./configure --prefix=/usr/local/cmake; \
+    make && make install; \
+    cd ..; \
+    rm -rf cmake-3.2.2
 
 #Build Trilinos
-RUN wget http://trilinos.sandia.gov/download/files/trilinos-11.8.1-Source.tar.bz2; \
-    tar xjvf trilinos-11.8.1-Source.tar.bz2; \
-    mkdir trilinos-11.8.1-Source/build
-ADD trilinos-debian-cmake.sh /trilinos-11.8.1-Source/build/trilinos-debian-cmake.sh
-RUN cd trilinos-11.8.1-Source/build; \
+RUN wget http://trilinos.csbsju.edu/download/files/trilinos-11.14.2-Source.tar.bz2; \
+    tar xjvf trilinos-11.14.2-Source.tar.bz2; \
+    mkdir trilinos-11.14.2-Source/build
+ADD trilinos-debian-cmake.sh /trilinos-11.14.2-Source/build/trilinos-debian-cmake.sh
+RUN cd trilinos-11.14.2-Source/build; \
     ./trilinos-debian-cmake.sh; \
     make && make install; \
     cd ../..; \
-    rm -rf trilinos-11.8.1-Source trilinos-11.8.1-Source.tar.bz2 
+    rm -rf trilinos-11.14.2-Source trilinos-11.14.2-Source.tar.bz2 
 
diff --git a/trilinos-debian-cmake.sh b/trilinos-debian-cmake.sh
@@ -5,7 +5,7 @@ rm -f CMakeCache.txt
 MPI_HOME=/usr
 EXTRA_ARGS=$@
 
-cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/trilinos/ \
+/usr/local/cmake/bin/cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/trilinos/ \
   \
   -D MPI_BASE_DIR:PATH=/usr \
   \