| Message ID | 1425808043-32292-4-git-send-email-s.martin49@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
On Sun, Mar 8, 2015 at 10:47 AM, Samuel Martin <s.martin49@gmail.com> wrote: > This change prevents CMake from searching outside the sysroot location > for CMake modules when cross-compiling. > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com> > --- > This patch is a better fix to [1] wrt the Arnout's comment [2] > > [1] http://lists.busybox.net/pipermail/buildroot/2015-January/117994.html > [2] http://lists.busybox.net/pipermail/buildroot/2015-January/118154.html > --- > support/misc/toolchainfile.cmake.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in > index 816af13..cd41254 100644 > --- a/support/misc/toolchainfile.cmake.in > +++ b/support/misc/toolchainfile.cmake.in > @@ -21,6 +21,7 @@ set(CMAKE_INSTALL_SO_NO_EXE 0) > set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/usr/bin") > set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > -- > 2.3.2 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Dear Samuel Martin, On Sun, 8 Mar 2015 10:47:22 +0100, Samuel Martin wrote: > This change prevents CMake from searching outside the sysroot location > for CMake modules when cross-compiling. > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> Applied, thanks! Thomas
diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index 816af13..cd41254 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -21,6 +21,7 @@ set(CMAKE_INSTALL_SO_NO_EXE 0) set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/usr/bin") set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")
This change prevents CMake from searching outside the sysroot location for CMake modules when cross-compiling. Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- This patch is a better fix to [1] wrt the Arnout's comment [2] [1] http://lists.busybox.net/pipermail/buildroot/2015-January/117994.html [2] http://lists.busybox.net/pipermail/buildroot/2015-January/118154.html --- support/misc/toolchainfile.cmake.in | 1 + 1 file changed, 1 insertion(+)