summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/cmake
AgeCommit message (Collapse)AuthorFiles
2016-10-15cmake: improve CMAKE_SYSTEM_PROCESSOR assignment in nativesdkRoss Burton1
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. Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-10-15cmake: also set CMAKE_FIND_ROOT_PATH_MODE_PACKAGERoss Burton1
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. Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-10-03cmake: Use bb.fatal() instead of raising FuncFailedUlf Magnusson1
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. Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-09-23cmake-native: prefer native sysroot libraries over hostRoss Burton1
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. Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-09-16cmake-native: rationalise system/internal library dependenciesRoss Burton1
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 ] Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-09-16cmake: use convenience options for clarityRoss Burton1
The intention here was "everything but jsoncpp is system provided" so use the convenience option to ensure this remains true in the future. Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-09-15cmake: don't inherit autotoolsRoss Burton2
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. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-09-14meta: cleanup d.getVar(var, 1)Robert Yang1
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-08-01cmake: upgrade to 3.6.1Maxin B. John3
3.5.2 -> 3.6.1 Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-07-07classes/cmake: enable progress for do_compilePaul Eggleton1
cmake outputs percentage complete as part of its compilation process, so we can enable BitBake's new progress scanning for do_compile here. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-22cmake: update to 3.5.2Maxin B. John4
Adjust LIC_FILES_CHKSUM due to changes in the Copyright date. No change to the license text. Remove the upstreamed patch: 1. 0001-Add-NIOS2-CPU-support.patch Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-04-06cmake: remove unused dont-run-cross-binaries.patchRobert Yang1
It hasn't been used since June 2015 when upgraded the recipe, this patch was used for crosscompiling, now the crosscompile works well without it, so remove it. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-18cmake: Update to 3.4.3.Philip Balister3
* Tested by building gnuradio and friends for a cortex-a9 machine. Signed-off-by: Philip Balister <philip@balister.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-26cmake: update to 3.4.2Alexander Kanavin3
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-12-09cmake: Add nios2 supportMarek Vasut2
Add the necessary bits for nios2 support into cmake. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Ley Foon Tan <lftan@altera.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.com> Cc: Thomas Chou <thomas@wytron.com.tw> Cc: Walter Goossens <waltergoossens@home.nl> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-12-08package_regex.inc: split the rest of the entries to their recipesAlexander Kanavin1
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-11-16cmake: update 3.3.1 -> 3.3.2Andre McCurdy3
Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-09-01cmake: update to 3.3.1Alexander Kanavin3
Share tarball checksums between cmake and cmake-native via cmake.inc. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-26cmake: Upgrade 2.8.12.2 -> 3.2.2Moritz Blume6
Patches "qt4-fail-silent.patch" and "support-oe-qt4-tools-names.patch" were adapted in order to fit to CMake 3.2.2 (refer to the commit message in the respective patch for details). Patch "cmake-2.8.11.2-FindFreetype.patch" was dropped since it was rejected upstream and its functionality otherwise implemented in the meantime. Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-01-16cmake: fix B != SRobert Yang1
And bump PR to avoid: | Error when bootstrapping CMake: | Found directory "/path/to/cmake-2.8.12.2/Bootstrap.cmk". | Looks like somebody did bootstrap CMake in the source tree, but now you are | trying to do bootstrap in the binary tree. Please remove Bootstrap.cmk | directory from the source tree. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2015-01-07cmake-native: disable check for acl.hChen Qi1
We build cmake-native without acl support. However, the acl.h header is still being checked which would sometimes cause the following error during do_compile: archive_read_disk_entry_from_file.c:38:21: fatal error: sys/acl.h: No such file or directory | #include <sys/acl.h> | ^ | compilation terminated. This happens when the sysroot parts of acl-native is removed between do_configure and do_compile tasks of cmake-native. To reproduce the problem manually, execute the following command: bitbake cmake-native -c cleansstate && bitbake acl-native -c cleansstate && \ bitbake acl-native && bitbake cmake-native -c configure && \ bitbake acl-native -c cleansstate && bitbake cmake-native -c compile This patch fixes the above problem by explicitly disable the checking for acl.h header file. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2014-11-20cmake: drop already applied patchesPaul Eggleton3
These patches were part of the 2.8.11 release. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-10-24nativesdk-cmake: Adjust toolchain paths dynamicallyOtavio Salvador3
This patch adds a flexible way to configure the CMake in SDKs. It adds a toolchain configuration script which supports subscripts for extensions, as for example Qt5. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-28cmake: Avoid accidentally including libacl.hMike Crowe1
The cmake recipe doesn't depend on libacl yet cmake will detect libacl.h and use it by default. This risks build failures if libacl.h is unstaged during the build and it also means that the build cmake will sometimes support ACLs and sometimes not. This can be avoided by setting ENABLE_ACL=0 but until the fix for http://cmake.org/Bug/view.php?id=14866 is released we also need to set HAVE_ACL_LIBACL_H=0. Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-25Globally replace 'base_contains' calls with 'bb.utils.contains'Otavio Salvador1
The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-08cmake: Improve method for not building ccmakeMike Crowe3
In commit 4bee0a93ed985b38c6b4eb605d8e16f5d7c82d51 I introduced an unnecessary patch to do something that can easily be done without patching. The argument to disable building ccmake can be passed to configure provided it is preceded by "--". Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-04cmake: Remove dependency on ncursesMike Crowe1
Commit 2adc9a3f1f1db284f7d91193ad77b3524e0e0d2c stopped ccmake being built and that is the only part of cmake that relies on curses so we might as well stop depending on it. (Tested with a poisoned curses.h to prove that it is unused even if present.) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-04cmake-native: Stop building ccmakeMike Crowe2
The bootstrapped cmake is called in such a way that it will automatically enable building ccmake if curses is found. This tool isn't particularly useful to us and it will cause build problems if ncurses-native is built in parallel with cmake-native so let's just pass -DBUILD_CursesDialog=0 to disable the feature altogether as the non-native cmake does. Unfortunately this requires patching the bootstrap script since there appears to be no way to get this option through. Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-04cmake: Add ugly hack from meta-qt5 to prevent cmake trying to detect qt5Martin Jansa1
* cmake doesn't have dependency on qt4/qt5, so these tests usually fail but still can cause undeterministic results or build failures (when OE_QMAKE_PATH_EXTERNAL_HOST_BINS is undefined or native qmake removed while running the test in cmake) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28cmake: upgrade to 2.8.12.2Paul Eggleton2
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28autotools-brokensep: Mark recipes with broken separate build dir supportRichard Purdie1
This patch goes through the OE-Core recipes and marks those which use autotools but don't support a separate build directory (${S} != ${B}). A new class, autotools-brokensep is used for this purpose. This doesn't introduce any change in behaviour in its own right. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-28cmake: Fix freetype detectionMartin Jansa2
* since last freetype upgrade cmake cannot detect it * e.g. webkit-efl requires freetype and is failing because of this Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2014-01-02Replace one-line DESCRIPTION with SUMMARYPaul Eggleton1
A lot of our recipes had short one-line DESCRIPTION values and no SUMMARY value set. In this case it's much better to just set SUMMARY since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY is at least useful. I also took the opportunity to fix up a lot of the new SUMMARY values, making them concisely explain the function of the recipe / package where possible. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-11-12cmake: upgrade to 2.8.12.1Paul Eggleton2
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-29cmake: upgrade to 2.8.12Paul Eggleton2
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-17cmake-native: fix dependenciesPaul Eggleton2
When building cmake for native, we don't use the system libraries and thus cmake builds its own internal version of libarchive; this requires zlib, bzip2, and e2fsprogs. We can add to DEPENDS for the two former libraries and patch out the latter. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-10cmake: Update to 2.8.11.2Saul Wold3
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-07-09cmake: fix configure error if system Qt installation is brokenPaul Eggleton2
If the host Qt installation exists but is incomplete or the installed qmake architecture doesn't match that of the Qt libraries, cmake was failing at do_configure. cmake 2.8.10 failed silently here so we should make 2.8.11 do the same. Fixes [YOCTO #4565]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-06-13cmake: Update to 2.8.11.1Saul Wold3
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-24cmake: Update to 2.8.11Saul Wold5
Rebased support-oe-qt4-tools-names as some of the changes where added in the upstream code. Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-12Upstream-Status: Correct CapitalizationSaul Wold2
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-09classes/recipes/lib: Fix various python whitespace issuesRichard Purdie1
There are some left over tab characters in the python functions. This removes them and resolves python 3 errors. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-07cmake: add AArch64 supportMarcin Juszkiewicz3
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-19cmake-native: add checksumsTom Zanussi1
commit 771d08 (cmake: Update to 2.8.10.2) removed the checksums from cmake.inc, and added them to cmake, but forgot to add them to cmake-native - this adds them. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-19cmake: Update to 2.8.10.2Saul Wold3
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-12-03cmake: Update to 2.8.10.1Saul Wold6
Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-27cmake: Upgrade recipes to 2.8.8Khem Raj4
Copyright year change means a change in checksum ... CMake - Cross Platform Makefile Generator -Copyright 2000-2009 Kitware, Inc., Insight Software Consortium +Copyright 2000-2011 Kitware, Inc., Insight Software Consortium All rights reserved. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2012-03-14PR bump for all recipes that DEPEND on ncursesScott Garman1
The packaging changes to ncurses could break package feeds, so bump the PR on everythong that DEPENDS on ncurses. Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)Richard Purdie1
Using "1" with getVar is bad coding style and "True" is preferred. This patch is a sed over the meta directory of the form: sed \ -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \ -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \ -i `grep -ril getVar *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10Convert to use direct access to the data store (instead of bb.data.*Var*())Richard Purdie2
This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 00:16:56 +0000