From: Kevin Tian <kevin.tian@intel.com>
Date: Mon, 26 Jul 2010 05:14:13 +0000 (+0800)
Subject: cmake: only search root directory for FIND_***
X-Git-Tag: 2011-1~5050
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ea3cfbaf265797950e5eb41f5b886861c880597c;p=openembedded-core.git

cmake: only search root directory for FIND_***

default cmake behavior for FIND_***, is to first search listed directories prefixed
with CMAKE_FIND_ROOT_PATH, and if not found then go to unprefixed directories. This
is not desired as build system may be referenced.

this commit refine the search path only on prefixed directories, and thus fix
libmusicbrains build failure on some systems

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
---

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 019999165f..6adc43f057 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -7,7 +7,10 @@ EXTRA_OECMAKE ?= ""
 
 cmake_do_configure() {
      cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \
-     -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} ${EXTRA_OECMAKE}
+     -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} \
+     -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
+     -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
+     ${EXTRA_OECMAKE}
 }
 
 EXPORT_FUNCTIONS do_configure