diff options
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.12.2.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.12.2.bb | 19 |
2 files changed, 17 insertions, 4 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb index 9a1390f96df..3e59012b489 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb @@ -16,6 +16,8 @@ do_configure[cleandirs] = "${B}" # Disable ccmake since we don't depend on ncurses CMAKE_EXTRACONF = "\ -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ + -DCMAKE_DOC_DIR=doc/cmake \ + -DCMAKE_DATA_DIR=share/cmake \ -DBUILD_CursesDialog=0 \ -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ diff --git a/meta/recipes-devtools/cmake/cmake_3.12.2.bb b/meta/recipes-devtools/cmake/cmake_3.12.2.bb index e0457677e86..47a2a62cde4 100644 --- a/meta/recipes-devtools/cmake/cmake_3.12.2.bb +++ b/meta/recipes-devtools/cmake/cmake_3.12.2.bb @@ -10,23 +10,34 @@ SRC_URI_append_class-nativesdk = " \ file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ " -# Strip ${prefix} from ${docdir}, set result into docdir_stripped +# Strip ${prefix} from ${docdir} and ${datadir}, set result into +# docdir_stripped and datadir_stripped python () { prefix=d.getVar("prefix") docdir=d.getVar("docdir") + datadir=d.getVar("datadir") if not docdir.startswith(prefix): bb.fatal('docdir must contain prefix as its prefix') + if not datadir.startswith(prefix): + bb.fatal('datadir must contain prefix as its prefix') + docdir_stripped = docdir[len(prefix):] if len(docdir_stripped) > 0 and docdir_stripped[0] == '/': docdir_stripped = docdir_stripped[1:] + datadir_stripped = datadir[len(prefix):] + if len(datadir_stripped) > 0 and datadir_stripped[0] == '/': + datadir_stripped = datadir_stripped[1:] + d.setVar("docdir_stripped", docdir_stripped) + d.setVar("datadir_stripped", datadir_stripped) } EXTRA_OECMAKE=" \ - -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ + -DCMAKE_DOC_DIR=${docdir_stripped}/cmake \ + -DCMAKE_DATA_DIR=${datadir_stripped}/cmake \ -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ @@ -46,8 +57,8 @@ do_install_append_class-nativesdk() { FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" -FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal" -FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" +FILES_${PN} += "${datadir}/cmake ${datadir}/aclocal" +FILES_${PN}-doc += "${docdir}/cmake" FILES_${PN}-dev = "" BBCLASSEXTEND = "nativesdk" |