mirror of
https://github.com/neovim/neovim.git
synced 2024-12-24 05:05:00 -07:00
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.
This commit is contained in:
parent
6a193a0e2e
commit
64d78c0b7d
8
Makefile
8
Makefile
@ -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 $@
|
||||
|
13
third-party/CMakeLists.txt
vendored
13
third-party/CMakeLists.txt
vendored
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user