diff options
| author | Rui Abreu Ferreira <raf-ep@gmx.com> | 2014-12-01 15:59:55 +0000 |
|---|---|---|
| committer | Rui Abreu Ferreira <raf-ep@gmx.com> | 2014-12-16 10:28:43 +0000 |
| commit | 64d78c0b7d71304bd830ffd5c4e3aca446b82a1b (patch) | |
| tree | ee84472f6d25ef79fa98241848d37b16ae130feb | |
| parent | 6a193a0e2e22ae31dd04957174b1c958d1b792ec (diff) | |
| download | rneovim-64d78c0b7d71304bd830ffd5c4e3aca446b82a1b.tar.gz rneovim-64d78c0b7d71304bd830ffd5c4e3aca446b82a1b.tar.bz2 rneovim-64d78c0b7d71304bd830ffd5c4e3aca446b82a1b.zip | |
Dont force ../.deps in third-party/CMakeLists.txt
- third-party is built under .deps by default instead of using its own
${CMAKE_BINARY_DIR}, move this default setting out of the cmake
settings and into the Makefile.
- As a consequence the workflow of building third-party using CMake
should feel more natural, avoid the additional folder or setting
DEPS_DIR from the command line.
- This commit does not change the default behaviour when calling the
Makefile wrapper.
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 13 |
2 files changed, 8 insertions, 13 deletions
@@ -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) |