IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1588 from equalsraf/tb-no-central-deps

Browse Source 
Dont force ../.deps in third-party/CMakeLists.txt use the Makefile instead
This commit is contained in:
John Szakmeister 2014-12-18 08:11:00 -05:00
commit 1eef530351
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -5,12 +5,8 @@ project(NEOVIM)
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
# Prefer our bundled versions of dependencies. # Prefer our bundled versions of dependencies.
set(DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.deps") set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/usr" CACHE PATH "Path prefix for finding dependencies")
set(DEPS_BUILD_DIR "${DEPS_DIR}/build") list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX})
set(DEPS_INSTALL_DIR "${DEPS_DIR}/usr")
set(DEPS_BIN_DIR "${DEPS_INSTALL_DIR}/bin")
list(APPEND CMAKE_PREFIX_PATH ${DEPS_INSTALL_DIR})
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
# CMake tries to treat /sw and /opt/local as extension of the system path, but # CMake tries to treat /sw and /opt/local as extension of the system path, but

8
Makefile
View File

@ -64,15 +64,15 @@ build/.ran-cmake: | deps
deps: | build/.ran-third-party-cmake deps: | build/.ran-third-party-cmake
ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),) ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),)
+$(BUILD_CMD) -C .deps/build/third-party +$(BUILD_CMD) -C .deps
endif endif
build/.ran-third-party-cmake: build/.ran-third-party-cmake:
ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),) ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),)
mkdir -p .deps/build/third-party mkdir -p .deps
cd .deps/build/third-party && \ cd .deps && \
cmake -G '$(BUILD_TYPE)' $(BUNDLED_CMAKE_FLAG) \ cmake -G '$(BUILD_TYPE)' $(BUNDLED_CMAKE_FLAG) \
$(DEPS_CMAKE_FLAGS) ../../../third-party $(DEPS_CMAKE_FLAGS) ../third-party
endif endif
mkdir -p build mkdir -p build
touch $@ touch $@

13
third-party/CMakeLists.txt vendored
View File

@ -2,15 +2,10 @@
cmake_minimum_required (VERSION 2.8.7) cmake_minimum_required (VERSION 2.8.7)
project(NEOVIM_DEPS) project(NEOVIM_DEPS)
if(NOT DEPS_DIR) set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/usr")
get_filename_component(PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR} PATH) set(DEPS_BIN_DIR "${CMAKE_BINARY_DIR}/usr/bin")
set(DEPS_DIR ${PARENT_DIR}/.deps) set(DEPS_LIB_DIR "${CMAKE_BINARY_DIR}/usr/lib")
endif() set(DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build")
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_DOWNLOAD_DIR "${DEPS_BUILD_DIR}/downloads") set(DEPS_DOWNLOAD_DIR "${DEPS_BUILD_DIR}/downloads")
option(USE_BUNDLED "Use bundled dependencies." ON) option(USE_BUNDLED "Use bundled dependencies." ON)