summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-10-10 12:41:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-15 10:01:42 +0100
commit62a01634c59e476f14ce21b64349642073c90356 (patch)
tree4eac2e9c255c50ee0665841d11a4ebc38f538b56 /meta
parentb7b2e348716161deb21c9864ac5caa5f1df1fa9c (diff)
downloadpoky-62a01634c59e476f14ce21b64349642073c90356.tar.gz
cmake: also set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
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. (From OE-Core rev: 2df2372a31b02eab933e4a7aa6d5f8ca48e02c04) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
index 60014bbf2b..0ce6573818 100644
--- a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
+++ b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
@@ -3,10 +3,12 @@ set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE )
3set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE ) 3set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE )
4set( CMAKE ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) 4set( CMAKE ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE )
5set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE ) 5set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE )
6
6set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} $ENV{OECORE_NATIVE_SYSROOT} ) 7set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} $ENV{OECORE_NATIVE_SYSROOT} )
7set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) 8set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
8set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) 9set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
9set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) 10set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
11set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
10 12
11string(REGEX MATCH "sysroots/([a-zA-Z0-9]+)" CMAKE_SYSTEM_PROCESSOR $ENV{SDKTARGETSYSROOT}) 13string(REGEX MATCH "sysroots/([a-zA-Z0-9]+)" CMAKE_SYSTEM_PROCESSOR $ENV{SDKTARGETSYSROOT})
12string(REGEX REPLACE "sysroots/" "" CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}) 14string(REGEX REPLACE "sysroots/" "" CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})