aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Abreu Ferreira <raf-ep@gmx.com>2015-04-19 00:20:26 +0100
committerSeth Jackson <sethjackson@gmail.com>2015-12-15 13:53:46 -0500
commit8be2ab11de3c60eedc92cf29c98a28d7c6d57174 (patch)
tree433fb2836d424e5e8b7feda4ad0a4043a3ab2bbe
parent77c0f9a62b4fd465ac9e37d0839695e100238a1c (diff)
downloadrneovim-8be2ab11de3c60eedc92cf29c98a28d7c6d57174.tar.gz
rneovim-8be2ab11de3c60eedc92cf29c98a28d7c6d57174.tar.bz2
rneovim-8be2ab11de3c60eedc92cf29c98a28d7c6d57174.zip
Fix CMakeLists.txt search paths for cross compile
-rw-r--r--CMakeLists.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c471ece71..43f283d8f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,13 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
# Prefer our bundled versions of dependencies.
set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/usr" CACHE PATH "Path prefix for finding dependencies")
-list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX})
-set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
+if(CMAKE_CROSSCOMPILING AND NOT UNIX)
+ list(INSERT CMAKE_FIND_ROOT_PATH 0 ${DEPS_PREFIX})
+ list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX}/../host/bin)
+else()
+ list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX})
+ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
+endif()
# used for check_c_compiler_flag
include(CheckCCompilerFlag)