linux/poky.git/meta/recipes-devtools/cmake, branch morty-next

cmake: avoid configure failures if CFLAGS contains -Wstrict-prototypes

2018-01-07T17:10:09+00:00

(From OE-Core rev: 294b706d2b5d6732c8b05e6cf0300c62de1f909f) Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton (cherry picked from commit 0c89b010ce2e426f55ac7c6f94befef988913834) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie

cmake: improve CMAKE_SYSTEM_PROCESSOR assignment in nativesdk

2016-10-15T09:01:42+00:00

The previous string manipulations would result in the wrong string being used for machines such as intel-corei7-64 as the sysroot was split at the first hyphen (so would result in corei7 instead of corei7-64). Change the logic so that it looks for processor-distro-os and uses the whole of the processor field. (From OE-Core rev: ce24958d644f2218d5415be574a5b7e1ee8c9b2d) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

cmake: also set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE

2016-10-15T09:01:42+00:00

The other CMAKE_FIND_ROOT_PATH_MODE_* variables were already set to ONLY, but PACKAGE was left out. Fix this so that cmake doesn't look on the host for cmake modules when it should only be looking in the target sysroot. (From OE-Core rev: 2df2372a31b02eab933e4a7aa6d5f8ca48e02c04) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

cmake: Use bb.fatal() instead of raising FuncFailed

2016-10-04T15:29:05+00:00

This sets a good example and avoids unnecessarily contributing to perceived complexity and cargo culting. Motivating quote below: < kergoth> the *original* intent was for the function/task to error via whatever appropriate means, bb.fatal, whatever, and funcfailed was what you'd catch if you were calling exec_func/exec_task. that is, it's what those functions raise, not what metadata functions should be raising < kergoth> it didn't end up being used that way < kergoth> but there's really never a reason to raise it yourself FuncFailed.__init__ takes a 'name' argument rather than a 'msg' argument, which also shows that the original purpose got lost. (From OE-Core rev: ff310dd103e16a5345a4bb48090af05f50171de3) Signed-off-by: Ulf Magnusson Signed-off-by: Richard Purdie

cmake-native: prefer native sysroot libraries over host

2016-09-23T13:56:39+00:00

Explicitly set CMAKE_LIBRARY_PATH so that find_library() looks in the native sysroot before the host. Also pass --verbose to configure which sets CMAKE_VERBOSE_MAKEFILE for detailed compile logs. (From OE-Core rev: 89b28990ff3ef8ac7a33a0a3f9177b9bd0e1530b) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

cmake-native: rationalise system/internal library dependencies

2016-09-16T14:24:03+00:00

By default cmake will auto-detect if a library is present on the host and if it isn't present will use an internal fork. For some libraries using the internal fork is preferable as it can be built with less dependencies, but for others we're either already building it or the impact of building it is comparable to internal build. Continue to use the internal fork of libarchive as our libarchive-native has a large number of build dependencies. Using the internal libarchive means that system bzip2 and zlib must be used. Explicitly use the internal fork of jsoncpp as we don't have this in oe-core. Explicitly depend on curl-native, expat-native, and xz-native to ensure these dependencies are not floating. curl-native is a non-trivial dependency but is comparable to building the internal fork, so there's no reason to build it twice. Change bzip2-native to bzip2-replacement-native as bzip2-native is ASSUME_PROVIDED. [ YOCTO #9639 ] (From OE-Core rev: f9366799aaf4ad2b98345743c7129fa94d092880) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

cmake: use convenience options for clarity

2016-09-16T14:24:03+00:00

The intention here was "everything but jsoncpp is system provided" so use the convenience option to ensure this remains true in the future. (From OE-Core rev: f863b227e22b67ab239ee6124471fdc14de3f017) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

cmake: don't inherit autotools

2016-09-16T14:24:02+00:00

cmake doesn't use autotools, the functions get replaced by either cmake.bbclass (target) or the recipe itself (native) leaving just lots of superfluous dependencies. (From OE-Core rev: b8700e9fd30317d0ad583febb4e6f385284bdd51) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

meta: cleanup d.getVar(var, 1)

2016-09-14T21:22:07+00:00

(From OE-Core rev: 79fe476be233015c1c90e9c3fb4572267b5551d1) Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

cmake: upgrade to 3.6.1

2016-08-01T10:47:12+00:00

3.5.2 -> 3.6.1 (From OE-Core rev: 3c41b239991baff2bb1facc1e9973c95c9328175) Signed-off-by: Maxin B. John Signed-off-by: Ross Burton Signed-off-by: Richard Purdie