diff --git a/src/secp256k1/travis/build_cmake.sh b/src/secp256k1/travis/build_cmake.sh index d71955baa3..f191ce4649 100755 --- a/src/secp256k1/travis/build_cmake.sh +++ b/src/secp256k1/travis/build_cmake.sh @@ -1,35 +1,42 @@ #!/usr/bin/env bash export LC_ALL=C set -ex if [ "x$HOST" = "xi686-linux-gnu" ]; then CMAKE_EXTRA_FLAGS="-DCMAKE_C_FLAGS=-m32" fi +# "auto" is not a valid value for SECP256K1_ECMULT_GEN_PRECISION with cmake. +# In this case we use the default value instead by not setting the cache +# variable on the cmake command line. +if [ "x$ECMULTGENPRECISION" != "xauto" ]; then + ECMULT_GEN_PRECISION_ARG="-DSECP256K1_ECMULT_GEN_PRECISION=$ECMULTGENPRECISION" +fi + mkdir -p buildcmake/install pushd buildcmake # Use the cmake version installed via APT instead of the Travis custom one. CMAKE_COMMAND=/usr/bin/cmake ${CMAKE_COMMAND} --version ${CMAKE_COMMAND} -GNinja .. \ -DCMAKE_INSTALL_PREFIX=install \ -DSECP256K1_ECMULT_STATIC_PRECOMPUTATION=$STATICPRECOMPUTATION \ - -DSECP256K1_ECMULT_GEN_PRECISION=$ECMULTGENPRECISION \ -DSECP256K1_ENABLE_MODULE_ECDH=$ECDH \ -DSECP256K1_ENABLE_MODULE_RECOVERY=$RECOVERY \ -DSECP256K1_ENABLE_MODULE_SCHNORR=$SCHNORR \ -DSECP256K1_ENABLE_JNI=$JNI \ -DSECP256K1_ENABLE_ENDOMORPHISM=$ENDOMORPHISM \ -DSECP256K1_ENABLE_BIGNUM=$BIGNUM \ -DSECP256K1_USE_ASM=$ASM \ -DUSE_FIELD=$FIELD \ -DUSE_SCALAR=$SCALAR \ + $ECMULT_GEN_PRECISION_ARG \ $CMAKE_EXTRA_FLAGS ninja $CMAKE_TARGET popd