Add cmake to all travis install targets

Author: erikzenker

.travis.yml

@@ -32,8 +32,8 @@ env:
     - OMP_NUM_THREADS: 4 # ignored in thread layer
     - COMPILER: gcc
   matrix:
-    - DEPS_RESOLVE_BY: manual
-    - DEPS_RESOLVE_BY: conan
+    - RESOLVE_DEPS_BY: manual
+    - RESOLVE_DEPS_BY: conan
 
 before_install:
   - mkdir -p $HOME/build
@@ -54,31 +54,32 @@ before_install:
   - $CC --version
 
 install:
+  #############################################################################
+  # CMAKE                                                                     #
+  #############################################################################
+  - export PATH=$CMAKE_ROOT/bin:$PATH
+  - CMAKE_33_FOUND=$(cmake --version | grep " 3\.3\." >/dev/null && { echo 0; } || { echo 1; })
+  - if [ $CMAKE_33_FOUND -ne 0 ]; then
+      mkdir -p $CMAKE_ROOT &&
+      cd $CMAKE_ROOT &&
+      travis_retry wget --no-check-certificate http://www.cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz &&
+      tar -xzf cmake-3.3.2-Linux-x86_64.tar.gz --overwrite &&
+      mv -f cmake-3.3.2-Linux-x86_64/* . &&
+      rm -rf cmake-3.3.2-Linux-x86_64.tar.gz cmake-3.3.2-Linux-x86_64 &&
+      cd -;
+   fi
+  - cmake --version;
 
     #############################################################################
     # Resolve dependencies manually
     #############################################################################
-  - if [ "$DEPS_RESOLVE_BY" == "manual" ]; then
+  - if [ "$RESOLVE_DEPS_BY" == "manual" ]; then
       echo "Resolve library dependencies manually.";
-    elif [ "$DEPS_RESOLVE_BY" == "conan" ]; then
+    elif [ "$RESOLVE_DEPS_BY" == "conan" ]; then
       pip install --upgrade pip --user;
       pip install conan --user;
     fi
-  #############################################################################
-  # CMAKE                                                                     #
-  #############################################################################
-#   export PATH=$CMAKE_ROOT/bin:$PATH;
-#   CMAKE_33_FOUND=$(cmake --version | grep " 3\.3\." >/dev/null && { echo 0; } || { echo 1; });
-#   if [ $CMAKE_33_FOUND -ne 0 ]; then
-#      mkdir -p $CMAKE_ROOT &&
-#      cd $CMAKE_ROOT &&
-#      travis_retry wget --no-check-certificate http://www.cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz &&
-#      tar -xzf cmake-3.3.2-Linux-x86_64.tar.gz --overwrite &&
-#      mv -f cmake-3.3.2-Linux-x86_64/* . &&
-#      rm -rf cmake-3.3.2-Linux-x86_64.tar.gz cmake-3.3.2-Linux-x86_64 &&
-#      cd -;
-#   fi;
-#   cmake --version;
+
   #############################################################################
   # BOOST                                                                     #
   #############################################################################
@@ -124,16 +125,16 @@ install:
 #      echo "ZeroMQ directory already exists";
 #    fi;
 #
-  #elif [ "$DEPS_RESOLVE_BY" = "conan" ]; then
+  #elif [ "$RESOLVE_DEPS_BY" = "conan" ]; then
  # else
 #    echo "Resolve library dependencies using conan.";
 
 #  fi
 
 script:
-  - if [ "$DEPS_RESOLVE_BY" == "manual" ]; then
+  - if [ "$RESOLVE_DEPS_BY" == "manual" ]; then
       echo "Build with manually installed dependencies.";
-    elif [ "$DEPS_RESOLVE_BY" == "conan" ]; then
+    elif [ "$RESOLVE_DEPS_BY" == "conan" ]; then
       cd $HOME/build;
       conan install $GRAYBAT_ROOT --build=missing;
       cmake $CMAKE_FLAGS $GRAYBAT_ROOT;
@@ -143,11 +144,11 @@ script:
      ctest --output-on-failure;
      killall gbZMQSignaling;
     fi
-#- if ["$DEPS_RESOLVE_BY" = "manual"]; then
+#- if ["$RESOLVE_DEPS_BY" = "manual"]; then
 #    cd $HOME/build;
 #    cmake $CMAKE_FLAGS $GRAYBAT_ROOT;
 #    make check
-#  elif ["$DEPS_RESOLVE_BY" = "conan"]; then
+#  elif ["$RESOLVE_DEPS_BY" = "conan"]; then
 #    cd $HOME/build;
 #    conan install $GRAYBAT_ROOT --build=missing;
 #    cmake $CMAKE_FLAGS $GRAYBAT_ROOT;