Merge pull request #205 from vgough/travis

fix travis build

.travis.yml

@@ -1,5 +1,7 @@
 language: cpp
 
+sudo: false
+
 compiler:
   - gcc
   - clang
@@ -8,6 +10,7 @@ branches:
   only:
     - master
     - coverity_scan
+    - travis
 
 env:
   global:
@@ -15,11 +18,6 @@ env:
    #   via the "travis encrypt" command using the project repo's public key
    - secure: "KuAAwjiIqkk4vqSX/M3ZZIvQs6edm+tV8IADiklTUYZIFyxu8FgZ6RbDdMD2sef5bNZA1OZhlcbeRtiKff5CfMtvzc607Lg3NUkpi+ShMynWgqS/e0uCMf9ogEJlUiZMxf4juBi7v6DyMl/WV6pAdJmdfHtzcj8GF2mgTfQjkO8="
 
-before_install:
-  - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca
-  #  - sudo apt-get update -qq
-  #- sudo apt-get install -qq cmake libfuse-dev libgettextpo-dev
-
 install:
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
 
@@ -41,6 +39,7 @@ addons:
     build_command_prepend: "cd build && make clean"
     build_command:   "make -j 4"
     branch_pattern: coverity_scan
+
   apt:
     sources:
       - ubuntu-toolchain-r-test

CMakeLists.txt

@@ -28,6 +28,9 @@ else ()
   if (CMAKE_COMPILER_IS_GNUCXX)
     message ("** Assuming that GNU CXX uses -std=c++11 flag for C++11 compatibility.")
     list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
+  elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    message ("** Assuming that Clang uses -std=c++11 flag for C++11 compatibility.")
+    list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
   else()
     message ("** No CMAKE C++11 check. If the build breaks, you're on your own.")
   endif()

ci/config.sh

@@ -0,0 +1,5 @@
+set -x
+set -e
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX:PATH=/tmp/encfs -DCMAKE_BUILD_TYPE=Debug -DMINIGLOG=ON ..

ci/install-cmake.sh

@@ -0,0 +1,7 @@
+set -x
+set -e
+if [ ! -e ci/cmake/bin/cmake ]; then
+  wget http://www.cmake.org/files/v3.1/cmake-3.1.3-Linux-x86_64.tar.gz
+  tar -xzf cmake-3.1.3-Linux-x86_64.tar.gz
+  mv cmake-3.1.3-Linux-x86_64 ci/cmake
+fi

ci/install-gcc.sh

@@ -0,0 +1,5 @@
+set -x
+set -e
+sudo apt-get install -y gcc-4.8 g++-4.8
+sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 100
+sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 100