diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-06-27 06:53:29 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-06-27 06:53:29 -0400 |
| commit | b083c0346234bf5c564a3036d568607fc66da045 (patch) | |
| tree | 0c30de12c7ee4538ccd230f02f2a3271a953fac2 | |
| parent | b17d9691a24099c9210289f16afb1a498a89d803 (diff) | |
| parent | b235793dac131673abeb07393b49475e4f8a4393 (diff) | |
| download | rneovim-b083c0346234bf5c564a3036d568607fc66da045.tar.gz rneovim-b083c0346234bf5c564a3036d568607fc66da045.tar.bz2 rneovim-b083c0346234bf5c564a3036d568607fc66da045.zip | |
Merge pull request #844:
'Fix #838: build with "USE_BUNDLED=OFF" fails to find dependencies'
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rwxr-xr-x | scripts/travis.sh | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b44acd4b20..3235d0e942 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,6 @@ cmake_minimum_required (VERSION 2.8.7) project (NEOVIM) -set(CMAKE_SYSTEM_PROCESSOR i386) -set(CMAKE_SYSTEM_LIBRARY_PATH /lib32 /usr/lib32 /usr/local/lib32) -set(FIND_LIBRARY_USE_LIB64_PATHS OFF) -set(CMAKE_IGNORE_PATH /lib /usr/lib /usr/local/lib) - # Point CMake at any custom modules we may ship set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") 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 |