diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-12-18 08:11:00 -0500 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-12-18 08:11:00 -0500 |
| commit | 1eef5303514a8499fd376270bd89a40e2d3eafbb (patch) | |
| tree | 55ac6d47f55928a3214b7d5969fde9b3a22e6d2c | |
| parent | 379dcd7d7faf4c9b38042eca424d4ee72a768fa6 (diff) | |
| parent | 8d54a7203efe49ec7693c59e9e45d0389c520df3 (diff) | |
| download | rneovim-1eef5303514a8499fd376270bd89a40e2d3eafbb.tar.gz rneovim-1eef5303514a8499fd376270bd89a40e2d3eafbb.tar.bz2 rneovim-1eef5303514a8499fd376270bd89a40e2d3eafbb.zip | |
Merge pull request #1588 from equalsraf/tb-no-central-deps
Dont force ../.deps in third-party/CMakeLists.txt use the Makefile instead
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 13 |
3 files changed, 10 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ec49bee339..42eb50ac43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,12 +5,8 @@ project(NEOVIM) list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") # Prefer our bundled versions of dependencies. -set(DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.deps") -set(DEPS_BUILD_DIR "${DEPS_DIR}/build") -set(DEPS_INSTALL_DIR "${DEPS_DIR}/usr") -set(DEPS_BIN_DIR "${DEPS_INSTALL_DIR}/bin") - -list(APPEND CMAKE_PREFIX_PATH ${DEPS_INSTALL_DIR}) +set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/usr" CACHE PATH "Path prefix for finding dependencies") +list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX}) if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") # CMake tries to treat /sw and /opt/local as extension of the system path, but @@ -64,15 +64,15 @@ build/.ran-cmake: | deps deps: | build/.ran-third-party-cmake ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),) - +$(BUILD_CMD) -C .deps/build/third-party + +$(BUILD_CMD) -C .deps endif build/.ran-third-party-cmake: ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),) - mkdir -p .deps/build/third-party - cd .deps/build/third-party && \ + mkdir -p .deps + cd .deps && \ cmake -G '$(BUILD_TYPE)' $(BUNDLED_CMAKE_FLAG) \ - $(DEPS_CMAKE_FLAGS) ../../../third-party + $(DEPS_CMAKE_FLAGS) ../third-party endif mkdir -p build touch $@ diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 9f0e3fac9e..f62d316441 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -2,15 +2,10 @@ cmake_minimum_required (VERSION 2.8.7) project(NEOVIM_DEPS) -if(NOT DEPS_DIR) - get_filename_component(PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR} PATH) - set(DEPS_DIR ${PARENT_DIR}/.deps) -endif() - -set(DEPS_INSTALL_DIR "${DEPS_DIR}/usr") -set(DEPS_BIN_DIR "${DEPS_DIR}/usr/bin") -set(DEPS_LIB_DIR "${DEPS_DIR}/usr/lib") -set(DEPS_BUILD_DIR "${DEPS_DIR}/build") +set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/usr") +set(DEPS_BIN_DIR "${CMAKE_BINARY_DIR}/usr/bin") +set(DEPS_LIB_DIR "${CMAKE_BINARY_DIR}/usr/lib") +set(DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build") set(DEPS_DOWNLOAD_DIR "${DEPS_BUILD_DIR}/downloads") option(USE_BUNDLED "Use bundled dependencies." ON) |