summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cmake.bbclass2
-rw-r--r--meta/conf/bitbake.conf4
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index fcfd5dda4f..fd40a9863e 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -54,8 +54,6 @@ EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} "
54OECMAKE_TARGET_COMPILE ?= "all" 54OECMAKE_TARGET_COMPILE ?= "all"
55OECMAKE_TARGET_INSTALL ?= "install" 55OECMAKE_TARGET_INSTALL ?= "install"
56 56
57FILES_${PN}-dev += "${libdir}/cmake ${datadir}/cmake"
58
59# CMake expects target architectures in the format of uname(2), 57# CMake expects target architectures in the format of uname(2),
60# which do not always match TARGET_ARCH, so all the necessary 58# which do not always match TARGET_ARCH, so all the necessary
61# conversions should happen here. 59# conversions should happen here.
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 44ec869a16..fbf5669ddd 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -308,7 +308,8 @@ FILES_SOLIBSDEV ?= "${base_libdir}/lib*${SOLIBSDEV} ${libdir}/lib*${SOLIBSDEV}"
308FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \ 308FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \
309 ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \ 309 ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
310 ${datadir}/aclocal ${base_libdir}/*.o \ 310 ${datadir}/aclocal ${base_libdir}/*.o \
311 ${libdir}/${BPN}/*.la ${base_libdir}/*.la" 311 ${libdir}/${BPN}/*.la ${base_libdir}/*.la \
312 ${libdir}/cmake ${datadir}/cmake"
312SECTION_${PN}-dev = "devel" 313SECTION_${PN}-dev = "devel"
313ALLOW_EMPTY_${PN}-dev = "1" 314ALLOW_EMPTY_${PN}-dev = "1"
314RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})" 315RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
@@ -318,7 +319,6 @@ SECTION_${PN}-staticdev = "devel"
318RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})" 319RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})"
319 320
320FILES_${PN}-dbg = "/usr/lib/debug /usr/src/debug" 321FILES_${PN}-dbg = "/usr/lib/debug /usr/src/debug"
321
322SECTION_${PN}-dbg = "devel" 322SECTION_${PN}-dbg = "devel"
323ALLOW_EMPTY_${PN}-dbg = "1" 323ALLOW_EMPTY_${PN}-dbg = "1"
324 324