From 0efc8152160f6ef5c8bb4b5dc56019a7cdc14476 Mon Sep 17 00:00:00 2001 From: John Szakmeister Date: Fri, 28 Mar 2014 05:05:00 -0400 Subject: [PATCH] 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. --- CMakeLists.txt | 2 +- cmake/FindLibUV.cmake | 2 -- 2 files changed, 1 insertion(+), 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}"