kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Append to CMAKE_PREFIX_PATH instead setting it outright.

Browse Source 
Also, don't set it in the FindXxx cmake scripts--it's unnecessary, and
it resets the value.
This commit is contained in:
John Szakmeister 2014-03-28 05:05:00 -04:00
parent 4e29a820b6
commit 0efc815216
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@ set(DEPS_BUILD_DIR "${DEPS_DIR}/build")
set(DEPS_INSTALL_DIR "${DEPS_DIR}/usr") set(DEPS_INSTALL_DIR "${DEPS_DIR}/usr")
set(DEPS_BIN_DIR "${DEPS_INSTALL_DIR}/bin") set(DEPS_BIN_DIR "${DEPS_INSTALL_DIR}/bin")
set(CMAKE_PREFIX_PATH ${DEPS_INSTALL_DIR}) list(APPEND CMAKE_PREFIX_PATH ${DEPS_INSTALL_DIR})
set(NEOVIM_VERSION_MAJOR 0) set(NEOVIM_VERSION_MAJOR 0)
set(NEOVIM_VERSION_MINOR 0) set(NEOVIM_VERSION_MINOR 0)

2
cmake/FindLibUV.cmake
View File

@ -21,7 +21,6 @@ else()
set(LIMIT_SEARCH NO_DEFAULT_PATH) set(LIMIT_SEARCH NO_DEFAULT_PATH)
endif() endif()
set(CMAKE_PREFIX_PATH "${DEPS_INSTALL_DIR}")
find_path(LIBUV_INCLUDE_DIR uv.h find_path(LIBUV_INCLUDE_DIR uv.h
HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS} HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS}
PATHS "${DEPS_INSTALL_DIR}" PATHS "${DEPS_INSTALL_DIR}"
@ -35,7 +34,6 @@ endif(LIBUV_USE_STATIC)
list(APPEND LIBUV_NAMES uv) list(APPEND LIBUV_NAMES uv)
set(CMAKE_PREFIX_PATH "${DEPS_INSTALL_DIR}")
find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES} find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES}
HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS} HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS}
PATHS "${DEPS_INSTALL_DIR}" PATHS "${DEPS_INSTALL_DIR}"