diff --git a/src/secp256k1/.travis.yml b/src/secp256k1/.travis.yml --- a/src/secp256k1/.travis.yml +++ b/src/secp256k1/.travis.yml @@ -1,8 +1,13 @@ language: c os: linux +dist: xenial addons: apt: + sources: + - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: + - cmake - libgmp-dev - ninja-build compiler: @@ -36,7 +41,11 @@ env: HOST=i686-linux-gnu ENDOMORPHISM=yes addons: apt: + sources: + - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: + - cmake - gcc-multilib - libgmp-dev:i386 - ninja-build:i386 @@ -44,21 +53,33 @@ env: HOST=i686-linux-gnu addons: apt: + sources: + - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: + - cmake - gcc-multilib - ninja-build:i386 - compiler: gcc env: HOST=i686-linux-gnu ENDOMORPHISM=yes addons: apt: + sources: + - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: + - cmake - gcc-multilib - ninja-build:i386 - compiler: gcc env: HOST=i686-linux-gnu addons: apt: + sources: + - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: + - cmake - gcc-multilib - libgmp-dev:i386 - ninja-build:i386 diff --git a/src/secp256k1/travis/build_cmake.sh b/src/secp256k1/travis/build_cmake.sh --- a/src/secp256k1/travis/build_cmake.sh +++ b/src/secp256k1/travis/build_cmake.sh @@ -15,7 +15,11 @@ mkdir -p buildcmake pushd buildcmake -cmake -GNinja .. \ +# Use the cmake version installed via APT instead of the Travis custom one. +CMAKE_COMMAND=/usr/bin/cmake +${CMAKE_COMMAND} --version + +${CMAKE_COMMAND} -GNinja .. \ -DSECP256K1_ECMULT_STATIC_PRECOMPUTATION=$STATICPRECOMPUTATION \ -DSECP256K1_ENABLE_MODULE_ECDH=$ECDH \ -DSECP256K1_ENABLE_MODULE_RECOVERY=$RECOVERY \