diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-16 10:18:15 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-16 10:18:15 -0500 |
| commit | f9647d99b4c663a12dccb3991e0dfcd928e43e73 (patch) | |
| tree | 464683a5be7e3e1d38b4455c59872774f7b8f381 | |
| parent | c42cb49a96beb72b363a2e1e6958b8b2ebd611b1 (diff) | |
| parent | 8be2ab11de3c60eedc92cf29c98a28d7c6d57174 (diff) | |
| download | rneovim-f9647d99b4c663a12dccb3991e0dfcd928e43e73.tar.gz rneovim-f9647d99b4c663a12dccb3991e0dfcd928e43e73.tar.bz2 rneovim-f9647d99b4c663a12dccb3991e0dfcd928e43e73.zip | |
Merge pull request #3842 from sethjackson/cross-compile
Fix CMakeLists.txt search paths for cross compile
| -rw-r--r-- | CMakeLists.txt | 9 |
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) |