summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/cmake.bbclass3
-rw-r--r--meta/classes/perlnative.bbclass1
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"
25OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CXXFLAGS} -DNDEBUG" 25OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CXXFLAGS} -DNDEBUG"
26 26
27OECMAKE_RPATH ?= "" 27OECMAKE_RPATH ?= ""
28OECMAKE_PERLNATIVE_DIR ??= ""
28 29
29cmake_do_generate_toolchain_file() { 30cmake_do_generate_toolchain_file() {
30 cat > ${WORKDIR}/toolchain.cmake <<EOF 31 cat > ${WORKDIR}/toolchain.cmake <<EOF
@@ -41,7 +42,7 @@ set( CMAKE_CXX_FLAGS_RELEASE "${OECMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "CXXFLA
41 42
42# only search in the paths provided so cmake doesnt pick 43# only search in the paths provided so cmake doesnt pick
43# up libraries and tools from the native build machine 44# up libraries and tools from the native build machine
44set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ) 45set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR})
45set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) 46set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
46set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) 47set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
47set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) 48set( 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 @@
1PATH_prepend = "${STAGING_BINDIR_NATIVE}/perl-native:" 1PATH_prepend = "${STAGING_BINDIR_NATIVE}/perl-native:"
2DEPENDS += "perl-native" 2DEPENDS += "perl-native"
3OECMAKE_PERLNATIVE_DIR = "${STAGING_BINDIR_NATIVE}/perl-native"