diff options
author | Ross Burton <ross.burton@intel.com> | 2018-07-18 16:54:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-10 13:26:25 +0100 |
commit | b8a4eb80622228c7787c5465b4fef4563763c998 (patch) | |
tree | ea9ab4712667a08ce9bce6a066bbeba66fe4ec97 /meta/recipes-devtools | |
parent | b747e9e61a19753db54f43888623b9f15b8c5441 (diff) | |
download | poky-b8a4eb80622228c7787c5465b4fef4563763c998.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)
(From OE-Core rev: 5f985f02a932ebce238a6b1c644d2e3179226aab)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.10.3.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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() { | |||
44 | 44 | ||
45 | FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" | 45 | FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" |
46 | 46 | ||
47 | FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}" | 47 | FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal" |
48 | FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" | 48 | FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" |
49 | FILES_${PN}-dev = "" | ||
49 | 50 | ||
50 | BBCLASSEXTEND = "nativesdk" | 51 | BBCLASSEXTEND = "nativesdk" |