diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-03-28 05:05:00 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-03-28 05:09:45 -0400 |
| commit | 0efc8152160f6ef5c8bb4b5dc56019a7cdc14476 (patch) | |
| tree | 9d8d788992bc7d3fdece524635715dac19ebd748 | |
| parent | 4e29a820b60148f2371cf0aba219712faba56a1f (diff) | |
| download | rneovim-0efc8152160f6ef5c8bb4b5dc56019a7cdc14476.tar.gz rneovim-0efc8152160f6ef5c8bb4b5dc56019a7cdc14476.tar.bz2 rneovim-0efc8152160f6ef5c8bb4b5dc56019a7cdc14476.zip | |
Append to CMAKE_PREFIX_PATH instead setting it outright.
Also, don't set it in the FindXxx cmake scripts--it's unnecessary, and
it resets the value.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/FindLibUV.cmake | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3475ca0640..f89f47ace0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(DEPS_BUILD_DIR "${DEPS_DIR}/build") set(DEPS_INSTALL_DIR "${DEPS_DIR}/usr") 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_MINOR 0) diff --git a/cmake/FindLibUV.cmake b/cmake/FindLibUV.cmake index 357f12c3fd..d5b871398c 100644 --- a/cmake/FindLibUV.cmake +++ b/cmake/FindLibUV.cmake @@ -21,7 +21,6 @@ else() set(LIMIT_SEARCH NO_DEFAULT_PATH) endif() -set(CMAKE_PREFIX_PATH "${DEPS_INSTALL_DIR}") find_path(LIBUV_INCLUDE_DIR uv.h HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS} PATHS "${DEPS_INSTALL_DIR}" @@ -35,7 +34,6 @@ endif(LIBUV_USE_STATIC) list(APPEND LIBUV_NAMES uv) -set(CMAKE_PREFIX_PATH "${DEPS_INSTALL_DIR}") find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES} HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS} PATHS "${DEPS_INSTALL_DIR}" |