diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-05-31 10:24:02 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-05-31 13:15:56 -0400 |
| commit | 7e797067df8d120fcbfcb4986f58ab5bb662fadf (patch) | |
| tree | 49fd58fe3ffe625d52c57bda5c3bac4e05405cf1 | |
| parent | cd457b72ecfc0804af9c5e4a2b48058cd2fdde12 (diff) | |
| download | rneovim-7e797067df8d120fcbfcb4986f58ab5bb662fadf.tar.gz rneovim-7e797067df8d120fcbfcb4986f58ab5bb662fadf.tar.bz2 rneovim-7e797067df8d120fcbfcb4986f58ab5bb662fadf.zip | |
Make it easier to turn the bundled dependencies off.
| -rwxr-xr-x | scripts/travis.sh | 2 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index 83eba872cd..6b540dbccf 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -59,7 +59,7 @@ set_environment() { eval $($prefix/bin/luarocks path) export PATH="$prefix/bin:$PATH" export PKG_CONFIG_PATH="$prefix/lib/pkgconfig" - export DEPS_CMAKE_FLAGS="-DUSE_BUNDLED_LIBUV=OFF -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_MSGPACK=OFF -DUSE_BUNDLED_LUAROCKS=OFF" + export DEPS_CMAKE_FLAGS="-DUSE_BUNDLED=OFF" } # install prebuilt dependencies diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index fd16334830..ffd2e68b16 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -13,10 +13,12 @@ set(DEPS_LIB_DIR "${DEPS_DIR}/usr/lib") set(DEPS_BUILD_DIR "${DEPS_DIR}/build") set(DEPS_DOWNLOAD_DIR "${DEPS_BUILD_DIR}/downloads") -option(USE_BUNDLED_LIBUV "Use the bundled libuv." ON) -option(USE_BUNDLED_MSGPACK "Use the bundled msgpack." ON) -option(USE_BUNDLED_LUAJIT "Use the bundled version of luajit." ON) -option(USE_BUNDLED_LUAROCKS "Use the bundled version of luarocks." ON) +option(USE_BUNDLED "Use bundled dependencies." ON) + +option(USE_BUNDLED_LIBUV "Use the bundled libuv." ${USE_BUNDLED}) +option(USE_BUNDLED_MSGPACK "Use the bundled msgpack." ${USE_BUNDLED}) +option(USE_BUNDLED_LUAJIT "Use the bundled version of luajit." ${USE_BUNDLED}) +option(USE_BUNDLED_LUAROCKS "Use the bundled version of luarocks." ${USE_BUNDLED}) # TODO: add windows support |