summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-18 16:54:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-26 13:16:40 +0100
commit206f8102a45e5e91657dd6e8c098ffe0f257b1cc (patch)
tree918c989ec90e5c58b3197fcfaf5e337b7f4b5ea8
parent034ee07ed9b2e88272a010dbbdb685c293c09375 (diff)
downloadpoky-206f8102a45e5e91657dd6e8c098ffe0f257b1cc.tar.gz
cmake: put cmake.m4 and toolchain file in PN
Previously cmake-dev held some files which should be in cmake. - cmake.m4 should be in installed in cmake so it can be used out of the box - nativesdk-specific OEToolchainConfig.cmake file used to be in cmake, but the change of default packaging rules move it into cmake-dev. This recipe is the exception and it should be moved back. Add the extra paths to cmake, and clear FILES for cmake-dev to ensure nothing else slips in. (From OE-Core rev: a6ce79b87d3db57033a3d1710cb3292366a0a8f7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.11.4.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/cmake/cmake_3.11.4.bb b/meta/recipes-devtools/cmake/cmake_3.11.4.bb
index eb055b9757..e0457677e8 100644
--- a/meta/recipes-devtools/cmake/cmake_3.11.4.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.11.4.bb
@@ -46,7 +46,8 @@ do_install_append_class-nativesdk() {
46 46
47FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" 47FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}"
48 48
49FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}" 49FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal"
50FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" 50FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"
51FILES_${PN}-dev = ""
51 52
52BBCLASSEXTEND = "nativesdk" 53BBCLASSEXTEND = "nativesdk"