From aa6ef417f37ff65b0af067ba50163a7bc4e24e67 Mon Sep 17 00:00:00 2001 From: Alex Stewart Date: Fri, 13 Dec 2019 13:50:39 +0000 Subject: [PATCH] Specify Eigen3_DIR in iOS and Android Travis CI builds - Required after updates to use Eigen's own Eigen3Config.cmake instead of our original FindEigen.cmake module. Change-Id: I9b5ad43fa153713c64fc01d638611e9bae3a169b --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d604a50c..3e109b52f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,11 +49,11 @@ script: fi - | if [[ "$CERES_BUILD_TARGET" == "ANDROID" ]]; then - cmake -DCMAKE_TOOLCHAIN_FILE=/tmp/android-ndk-r20b/build/cmake/android.toolchain.cmake -DEIGEN_INCLUDE_DIR=/usr/include/eigen3 -DANDROID_ABI=arm64-v8a -DANDROID_STL=c++_shared -DANDROID_NATIVE_API_LEVEL=android-29 -DMINIGLOG=ON -DBUILD_EXAMPLES=OFF $TRAVIS_BUILD_DIR + cmake -DCMAKE_TOOLCHAIN_FILE=/tmp/android-ndk-r20b/build/cmake/android.toolchain.cmake -DEigen3_DIR=/usr/lib/cmake/eigen3 -DANDROID_ABI=arm64-v8a -DANDROID_STL=c++_shared -DANDROID_NATIVE_API_LEVEL=android-29 -DMINIGLOG=ON -DBUILD_EXAMPLES=OFF $TRAVIS_BUILD_DIR fi - | if [[ "$CERES_BUILD_TARGET" == "IOS" ]]; then - cmake -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/iOS.cmake -DEIGEN_INCLUDE_DIR=/usr/local/include/eigen3 -DIOS_PLATFORM=OS $TRAVIS_BUILD_DIR + cmake -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/iOS.cmake -DEigen3_DIR=/usr/local/share/eigen3/cmake -DIOS_PLATFORM=OS $TRAVIS_BUILD_DIR fi - make -j 4 - |