Merge pull request #82 from Qfusion/travis_test

Download and install CMake 3.16 for Travis builds

.travis.yml

@@ -1,6 +1,10 @@
 sudo: false
 dist: bionic
 language: c++
+cache: 
+  apt: true
+  directories:
+    - $HOME/.deps
 
 matrix:
   include:
@@ -68,6 +72,18 @@ matrix:
             - valgrind
 
 install:
+  - mkdir -p $HOME/.deps
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+      if [[ ! -d "$HOME/.deps/cmake" ]]; then
+        cd $HOME/.deps
+        CMAKE_URL="https://cmake.org/files/v3.16/cmake-3.16.3-Linux-x86_64.tar.gz"
+        mkdir -p cmake && travis_retry wget --no-clobber --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
+      fi
+      export PATH=${HOME}/.deps/cmake/bin:${PATH}
+      echo ${PATH}
+    fi
+  - cmake --version
   - cd "$TRAVIS_BUILD_DIR"
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -DNO_THIRDPARTY_CONTAINERS=ON -G Xcode .; fi
   - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then cmake -DBUILD_LUA_BINDINGS=ON -DBUILD_SAMPLES=ON -DDISABLE_RTTI_AND_EXCEPTIONS=${DISABLE_RTTI_AND_EXCEPTIONS:-OFF} -DNO_THIRDPARTY_CONTAINERS=${NO_THIRDPARTY_CONTAINERS:-OFF} -DNO_FONT_INTERFACE_DEFAULT=${NO_FONT_INTERFACE_DEFAULT:-OFF} -G Ninja .; fi

CMakeLists.txt

@@ -535,7 +535,7 @@ endif(NOT BUILD_FRAMEWORK)
 			message("-- Can SDL2 sample be built - yes")
 			include_directories(${SDL2_INCLUDE_DIR} ${GLEW_INCLUDE_DIR})
 
-			bl_sample(sdl2 ${sample_LIBRARIES}  ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${GLEW_LIBRARY})
+			bl_sample(sdl2 ${sample_LIBRARIES}  ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${GLEW_LIBRARIES})
 			set_property(TARGET sdl2 PROPERTY CXX_STANDARD 14)
 			set_property(TARGET sdl2 PROPERTY CXX_STANDARD_REQUIRED ON)
 		
@@ -569,7 +569,7 @@ endif(NOT BUILD_FRAMEWORK)
 			message("-- Can SFML 2.x sample be built - yes: with GLEW")
 			include_directories(${SFML_INCLUDE_DIR} ${GLEW_INCLUDE_DIR})
 			add_definitions( -DENABLE_GLEW )
-			bl_sample(sfml2 ${sample_LIBRARIES} ${SFML_LIBRARIES} ${GLEW_LIBRARY})
+			bl_sample(sfml2 ${sample_LIBRARIES} ${SFML_LIBRARIES} ${GLEW_LIBRARIES})
 		else()
 			message("-- Can SFML 2.x sample be built - yes: without GLEW")
 			include_directories(${SFML_INCLUDE_DIR})
@@ -733,4 +733,4 @@ else()
 	message("If you wish to use find_package(RmlUi) in your own project to find RmlUi library"
 		" please update cmake to version which provides CMakePackageConfighelpers module"
 		" or write generators for RmlUiConfig.cmake by yourself.")
-endif()
+endif()