diff options
| author | Phil Blundell <philb@gnu.org> | 2011-08-15 17:16:31 +0100 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-08-16 22:53:50 -0700 |
| commit | add9e4e30e0b1e0f93479b43ce61953efb90985d (patch) | |
| tree | c8402f17baaeb3304544e65ff4e45a688bab34ad | |
| parent | 13db5f420ca9bff98561f80d78958278734ad1f4 (diff) | |
| download | openembedded-core-add9e4e30e0b1e0f93479b43ce61953efb90985d.tar.gz openembedded-core-add9e4e30e0b1e0f93479b43ce61953efb90985d.tar.bz2 openembedded-core-add9e4e30e0b1e0f93479b43ce61953efb90985d.zip | |
cmake.bbclass, perlnative.bbclass: arrange for cmake to find perl-native
When CMake is looking for perl, it only searches in the specific directories
that it's told about and ignores ${PATH}. If perlnative is in use, ensure
that the appropriate installation path is added to the list of places that
cmake will look for perl, otherwise it won't ever be found.
Signed-off-by: Phil Blundell <philb@gnu.org>
| -rw-r--r-- | meta/classes/cmake.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/perlnative.bbclass | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 89a154f73c..ab23bedb38 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -25,6 +25,7 @@ OECMAKE_C_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CPPFLAGS} -DNDEBUG" OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CXXFLAGS} -DNDEBUG" OECMAKE_RPATH ?= "" +OECMAKE_PERLNATIVE_DIR ??= "" cmake_do_generate_toolchain_file() { cat > ${WORKDIR}/toolchain.cmake <<EOF @@ -41,7 +42,7 @@ set( CMAKE_CXX_FLAGS_RELEASE "${OECMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "CXXFLA # 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} ) +set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR}) set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) diff --git a/meta/classes/perlnative.bbclass b/meta/classes/perlnative.bbclass index 522344d9af..2211b72135 100644 --- a/meta/classes/perlnative.bbclass +++ b/meta/classes/perlnative.bbclass @@ -1,2 +1,3 @@ PATH_prepend = "${STAGING_BINDIR_NATIVE}/perl-native:" DEPENDS += "perl-native" +OECMAKE_PERLNATIVE_DIR = "${STAGING_BINDIR_NATIVE}/perl-native" |