[oe-commits] [openembedded-core] 02/41: cmake.bbclass: add HOSTTOOLS_DIR to CMAKE_FIND_ROOT_PATH

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 7847f431cd8db59fce8c9401a603c4b0678ee16d
Author: Michael Ho <Michael.Ho at bmw.de>
AuthorDate: Wed Aug 14 17:05:15 2019 +0200

    cmake.bbclass: add HOSTTOOLS_DIR to CMAKE_FIND_ROOT_PATH
    
    The find_program command will fail if it is used on a tool that is listed in
    ASSUME_PROVIDED. This is because these tools are in the hosttools directory
    which is not listed in CMAKE_FIND_ROOT_PATH so cmake will not find them.
    
    Adding the directory HOSTTOOLS_DIR to the CMAKE_FIND_ROOT_PATH variable fixes
    the initial issue of needing to search for tools in ASSUME_PROVIDED.
    
    Note that this change alone does not fix the issue because find_program will
    by default only look into the subdirectories bin and usr/bin under the paths
    in CMAKE_FIND_ROOT_PATH to find the programs and the hosttools directory has
    instead the symlinks directly present without these subdirectories.
    
    Set CMAKE_PROGRAM_PATH to by default include the root directory so
    find_program can search the hosttools directory without needing the prefix
    directories.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/cmake.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 2b317c8..291f1e8 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -106,11 +106,12 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" CACHE STRING "LDFLAGS" )
 
 # only search in the paths provided so cmake doesnt pick
 # up libraries and tools from the native build machine
-set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} ${EXTERNAL_TOOLCHAIN})
+set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} ${EXTERNAL_TOOLCHAIN} ${HOSTTOOLS_DIR})
 set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
 set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM} )
 set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
 set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+set( CMAKE_PROGRAM_PATH "/" )
 
 # Use qt.conf settings
 set( ENV{QT_CONF_PATH} ${WORKDIR}/qt.conf )

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.