]> code.ossystems Code Review - openembedded-core.git/commitdiff
cmake: also set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
authorRoss Burton <ross.burton@intel.com>
Mon, 10 Oct 2016 11:41:34 +0000 (12:41 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 15 Oct 2016 08:49:22 +0000 (09:49 +0100)
The other CMAKE_FIND_ROOT_PATH_MODE_* variables were already set to ONLY, but
PACKAGE was left out.  Fix this so that cmake doesn't look on the host for cmake
modules when it should only be looking in the target sysroot.

Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake

index 60014bbf2b67235ee4f5ba54d7b0bd9afa0ce4df..0ce6573818fb13fb557409cc8dbf625ea5b94963 100644 (file)
@@ -3,10 +3,12 @@ set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE )
 set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS}  CACHE STRING "" FORCE )
 set( CMAKE ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE )
 set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE )
+
 set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} $ENV{OECORE_NATIVE_SYSROOT} )
 set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
 set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
 set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
 
 string(REGEX MATCH "sysroots/([a-zA-Z0-9]+)" CMAKE_SYSTEM_PROCESSOR $ENV{SDKTARGETSYSROOT})
 string(REGEX REPLACE "sysroots/" "" CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})