From b38933b98c896bdfb468802b053d0d44f1a2ec09 Mon Sep 17 00:00:00 2001 From: Franck HOUSSEN Date: Tue, 2 Jun 2020 15:19:31 +0200 Subject: [PATCH] Do test 'icb-exmm' on bionic which may have eigen 3.3 ! --- .travis.yml | 6 +++--- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4f6f5b..510f785 100644 --- a/.travis.yml +++ b/.travis.yml @@ -135,7 +135,7 @@ jobs: # bionic <=> test "recent" systems, with ICB - stage: bionic dist: bionic - script: ./bootstrap && ./configure --enable-icb --enable-mpi && export VERBOSE=1 && make all && make check + script: ./bootstrap && ./configure --enable-icb --enable-icb-exmm --enable-mpi && export VERBOSE=1 && make all && make check - stage: bionic dist: bionic before_install: @@ -151,11 +151,11 @@ jobs: - sudo updatedb script: | cd $TRAVIS_BUILD_DIR && mkdir -p build && cd build && \ - cmake -DEXAMPLES=ON -DICB=ON -DMPI=ON -DPYTHON3=ON -DBOOST_PYTHON_LIBSUFFIX='36' .. && \ + cmake -DEXAMPLES=ON -DICB=ON -DICBEXMM=ON -DMPI=ON -DPYTHON3=ON -DBOOST_PYTHON_LIBSUFFIX='36' .. && \ export VERBOSE=1 && make all && make test # coverage: "recent" systems with ICB - stage: coverage - dist: xenial + dist: bionic script: | mkdir -p build && cd build \ && \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 38910af..c62729d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ if (PYTHON3) endif () if (ICBEXMM) - find_package(Eigen3) + find_package(Eigen3 3.3) if (NOT EIGEN3_FOUND) # If not found, piggy-back pkg-config files. message(WARNING "CMake didn't find the Eigen3 package. Try to look for pkg-config file...") find_package(PkgConfig REQUIRED)