]> code.ossystems Code Review - openembedded-core.git/commitdiff
cmake: only search root directory for FIND_***
authorKevin Tian <kevin.tian@intel.com>
Mon, 26 Jul 2010 05:14:13 +0000 (13:14 +0800)
committerRichard Purdie <rpurdie@linux.intel.com>
Wed, 28 Jul 2010 05:51:34 +0000 (22:51 -0700)
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>
meta/classes/cmake.bbclass

index 019999165f31fa09725203aa0bc7225817ac7ad7..6adc43f0574a0618b51e0e2e5557ffbd50add53d 100644 (file)
@@ -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