diff options
| author | Marcin Niestroj <m.niestroj@grinn-global.com> | 2019-08-01 11:01:49 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-08-03 02:35:00 +0300 |
| commit | 987539e2331f2c78e94cbcf3623a82a66dd52267 (patch) | |
| tree | b7398ce230bf703a2f87018f2b942c239f468e6b /mesonbuild/dependencies/data | |
| parent | f39600647d9fe95c91c80b0cc7e7a8c28524e778 (diff) | |
| download | meson-987539e2331f2c78e94cbcf3623a82a66dd52267.zip meson-987539e2331f2c78e94cbcf3623a82a66dd52267.tar.gz meson-987539e2331f2c78e94cbcf3623a82a66dd52267.tar.bz2 | |
Improve support for crosscompiled CMake modules
There are two variables that CMake takes into account during
find_package() in cross-compiled environments, which are: CMAKE_SYSROOT
and CMAKE_FIND_ROOT_PATH. Those are used in cmFindCommon::RerootPaths()
function, which blindly prepends all search paths with those specified
via CMAKE_SYSROOT and CMAKE_FIND_ROOT_PATH.
Extend search paths by using CMAKE_SYSROOT and CMAKE_FIND_ROOT_PATH in a
similar way as CMake does, so we successfully find CMake packages
information in cross-compiled environments.
Diffstat (limited to 'mesonbuild/dependencies/data')
| -rw-r--r-- | mesonbuild/dependencies/data/CMakePathInfo.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/data/CMakePathInfo.txt b/mesonbuild/dependencies/data/CMakePathInfo.txt index 713c2da..662ec58 100644 --- a/mesonbuild/dependencies/data/CMakePathInfo.txt +++ b/mesonbuild/dependencies/data/CMakePathInfo.txt @@ -25,5 +25,7 @@ endif() set(MESON_ARCH_LIST ${LIB_ARCH_LIST}) set(MESON_PATHS_LIST ${TMP_PATHS_LIST}) set(MESON_CMAKE_ROOT ${CMAKE_ROOT}) +set(MESON_CMAKE_SYSROOT ${CMAKE_SYSROOT}) +set(MESON_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH}) message(STATUS ${TMP_PATHS_LIST}) |