Update Travis configuration (#122)

Unfortunately we install an old version of CMake while travis appears to have a nice new one preinstalled which we should use instead. The previous changeset changed the CXX standard to a global property. It appears it is still broken in the version of CMake used on Travis, regrettably.

Author: DuncanMcBain

.travis.yml

@@ -45,6 +45,6 @@ script:
  ###########################
  - mkdir build
  - cd build
- - cmake ../ -DComputeCpp_DIR=/tmp/computecpp -DCOMPUTECPP_SDK_BUILD_TESTS=1 -DCOMPUTECPP_DISABLE_GCC_DUAL_ABI=1
+ - cmake ../ -DComputeCpp_DIR=/tmp/computecpp -DCOMPUTECPP_SDK_BUILD_TESTS=1 -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
  - make -j2
- - COMPUTECPP_TARGET="host" ctest -V -E opencl
+ - COMPUTECPP_TARGET="host" ctest -V

.travis/before_install.sh

@@ -2,9 +2,7 @@
 
 set -ev
 
-# Add modern dependencies (cmake, boost)
-sudo add-apt-repository ppa:george-edison55/cmake-3.x -y
 sudo apt-get update -q
-sudo apt-get install cmake ocl-icd-libopencl1 ocl-icd-dev opencl-headers -y 
+sudo apt-get install ocl-icd-libopencl1 ocl-icd-dev opencl-headers -y
 # Use gcc 5 as default
 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5

CMakeLists.txt

@@ -7,7 +7,7 @@ find_package(ComputeCpp REQUIRED)
 
 option(COMPUTECPP_SDK_USE_OPENMP "Enable OpenMP support in samples" OFF)
 
-set(GLOBAL PROPERTY CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 14)
 
 # Set include ComputeCpp directories
 include_directories(SYSTEM ${COMPUTECPP_INCLUDE_DIRECTORY})