diff options
Diffstat (limited to 'meta/classes/cmake.bbclass')
-rw-r--r-- | meta/classes/cmake.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index d9bcddbdbb..7ec6ca58fc 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass | |||
@@ -85,9 +85,12 @@ def map_host_arch_to_uname_arch(host_arch): | |||
85 | return "ppc64" | 85 | return "ppc64" |
86 | return host_arch | 86 | return host_arch |
87 | 87 | ||
88 | |||
88 | cmake_do_generate_toolchain_file() { | 89 | cmake_do_generate_toolchain_file() { |
89 | if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then | 90 | if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then |
90 | cmake_crosscompiling="set( CMAKE_CROSSCOMPILING FALSE )" | 91 | cmake_crosscompiling="set( CMAKE_CROSSCOMPILING FALSE )" |
92 | else | ||
93 | cmake_sysroot="set( CMAKE_SYSROOT \"${RECIPE_SYSROOT}\" )" | ||
91 | fi | 94 | fi |
92 | cat > ${WORKDIR}/toolchain.cmake <<EOF | 95 | cat > ${WORKDIR}/toolchain.cmake <<EOF |
93 | # CMake system name must be something like "Linux". | 96 | # CMake system name must be something like "Linux". |
@@ -120,6 +123,8 @@ set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) | |||
120 | set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) | 123 | set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) |
121 | set( CMAKE_PROGRAM_PATH "/" ) | 124 | set( CMAKE_PROGRAM_PATH "/" ) |
122 | 125 | ||
126 | $cmake_sysroot | ||
127 | |||
123 | # Use qt.conf settings | 128 | # Use qt.conf settings |
124 | set( ENV{QT_CONF_PATH} ${WORKDIR}/qt.conf ) | 129 | set( ENV{QT_CONF_PATH} ${WORKDIR}/qt.conf ) |
125 | 130 | ||