From b8a4eb80622228c7787c5465b4fef4563763c998 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 18 Jul 2018 16:54:50 +0100 Subject: 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) (From OE-Core rev: 5f985f02a932ebce238a6b1c644d2e3179226aab) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-devtools/cmake/cmake_3.10.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/cmake/cmake_3.10.3.bb b/meta/recipes-devtools/cmake/cmake_3.10.3.bb index 3f8fd7a997..7d81edc604 100644 --- a/meta/recipes-devtools/cmake/cmake_3.10.3.bb +++ b/meta/recipes-devtools/cmake/cmake_3.10.3.bb @@ -44,7 +44,8 @@ do_install_append_class-nativesdk() { FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" -FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}" +FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal" FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" +FILES_${PN}-dev = "" BBCLASSEXTEND = "nativesdk" -- cgit v1.2.3-54-g00ecf