From b235793dac131673abeb07393b49475e4f8a4393 Mon Sep 17 00:00:00 2001 From: John Szakmeister Date: Sun, 27 Apr 2014 11:57:14 -0400 Subject: Fix #838: build with "USE_BUNDLED=OFF" fails to find dependencies Stop forcing some platform setting that are really intended to be used for Travis CI. Under other systems, like Arch Linux, it prevents dependencies from being correctly located. --- scripts/travis.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/travis.sh b/scripts/travis.sh index ec617a42c6..29ac33d737 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -173,7 +173,13 @@ elif [ "$TRAVIS_BUILD_TYPE" = "gcc/ia32" ]; then # correctly. sudo apt-get install libncurses5-dev:i386 - $MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake" unittest + CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP \ + -DCMAKE_SYSTEM_PROCESSOR=i386 \ + -DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 \ + -DFIND_LIBRARY_USE_LIB64_PATHS=OFF \ + -DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib \ + -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake" + $MAKE_CMD CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" unittest $MAKE_CMD test elif [ "$TRAVIS_BUILD_TYPE" = "clint" ]; then ./scripts/clint.sh -- cgit