summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-07-26 13:14:13 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-27 22:51:34 -0700
commitea3cfbaf265797950e5eb41f5b886861c880597c (patch)
tree306fcd8206b2c34a1015317f2a9d28628bcc97a9
parent106de1f41cae0160de8cb060ea18d581403b3d08 (diff)
downloadopenembedded-core-ea3cfbaf265797950e5eb41f5b886861c880597c.tar.gz
openembedded-core-ea3cfbaf265797950e5eb41f5b886861c880597c.tar.bz2
openembedded-core-ea3cfbaf265797950e5eb41f5b886861c880597c.zip
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>
-rw-r--r--meta/classes/cmake.bbclass5
1 files changed, 4 insertions, 1 deletions
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