From 50c858c2f38336b28d1ccc082abe109c5c61585d Mon Sep 17 00:00:00 2001 From: Nicholas Guriev Date: Sun, 21 Jul 2019 13:49:40 +0300 Subject: [PATCH] Run tests with CMake on travis * Increase minimal Cmake version to bypass a crash in GoogleTest module. Change-Id: Ic898190a00101553db10b48c1620a5205a2f7158 --- .travis.yml | 1 + CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 341dee3..f40e68b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,3 +17,4 @@ script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true meson -Dtest=true builddir && ninja -C builddir test && ninja -C builddir install"; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true cmake -DLOTTIE_TEST=ON -Bbuilddir -H. && make -C builddir -j$(nproc) all test && make -C builddir install"; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bb5c35..2bb73a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 3.2 ) +cmake_minimum_required( VERSION 3.3 ) #declare project project( rlottie VERSION 0.0.1 LANGUAGES C CXX ASM) -- 2.7.4