summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake
Commit message (Collapse)AuthorAgeFilesLines
* cmake: whitelist CVE-2016-10642Ross Burton2020-09-171-0/+4
| | | | | | | | | | | | | This CVE is specific to the npm package that can install cmake, so isn't relevant to our cmake recipe. (From OE-Core rev: ad11e4a9afea5a4c9dd34a7fa37b82efd61952a4) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 8e74ed809ec4c1f61264ecf5be4bc319e5e07766) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Update 3.16.1 -> 3.16.5Domarys Correa2020-03-213-2/+2
| | | | | | | (From OE-Core rev: cb1e9808f1606d2acfbf540631035f166f823324) Signed-off-by: Domarys Correa <domarys.correa@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: 3.15.5 -> 3.16.1Pascal Bach2019-12-167-13/+13
| | | | | | | | | Patches have been refreshed and all of meta-oe and oe-core was sucessfully built. (From OE-Core rev: 469bcfbfe25afd9c480c26f117b81d65cc305fbe) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: upgrade 3.15.3 -> 3.15.5Wang Mingyu2019-12-043-2/+2
| | | | | | | | (From OE-Core rev: f5b3e39dbec9acaf7755b40172b2ce3f841b3a20) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Clarify BSD license variantChristophe PRIOUZEAU2019-10-151-1/+1
| | | | | | | | | The license of cmake is BSD-3-Clause (From OE-Core rev: 8621e32957ae67d096c10575a4046af372af60e9) Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: simplify over descriptive descriptions in devtoolsMaxime Roussin-Bélanger2019-10-151-3/+1
| | | | | | | | | | | | fix commandline -> command-line typo. according to: https://en.wikipedia.org/wiki/Command-line_interface https://wiki.debian.org/Apt (From OE-Core rev: ca7570d8c32c7cb5e3c620eee732fe070f4c6cb1) Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: add missing some description in devtoolsMaxime Roussin-Bélanger2019-10-081-0/+6
| | | | | | | (From OE-Core rev: 57075f3dede7ad25163deaf6686221dbe1b5ad02) Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: 3.15.2 -> 3.15.3Nathan Rossi2019-09-193-2/+2
| | | | | | | | | | Update to fix issues with Boost 1.71.0, see pull request: https://gitlab.kitware.com/cmake/cmake/merge_requests/3763 (From OE-Core rev: 89251c2227c38b528b52d56a59ffbe44f1af9cd3) Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: 3.15.1 -> 3.15.2Pascal Bach2019-08-133-2/+2
| | | | | | | | | I rebuilt all cmake recipes from poky and meta-oe without issue. (From OE-Core rev: b1ebf9122a5670044998adb83ca7a5a6c5454eaa) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: 3.14.5 -> 3.15.1Pascal Bach2019-08-127-41/+31
| | | | | | | | | | | The patches were refreshed with devtool. I rebuilt all cmake recipes from poky and meta-oe without issue. (From OE-Core rev: 022d642b0c8f464b451c543db50bb93012bce607) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: 3.14.1 -> 3.14.5Pascal Bach2019-06-273-2/+2
| | | | | | | | | | | | | Fixes: - A bug with Visual Studio 2019 - An issue with target_link_libraries and PRIVATE - An issue with include_directories (From OE-Core rev: 116e876ffdb32d107271bb35e15a5ad951f64f65) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake-native: Enable ccmake by default and depend on ncursesNathan Rossi2019-04-091-3/+2
| | | | | | | | | | Enable the building of the curses based ui for cmake. This depends on ncurses. (From OE-Core rev: a8397def4eebacb8876d021129309a6903b71b2f) Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: 3.14.0 -> 3.14.1Pascal Bach2019-04-043-2/+2
| | | | | | | | | | | | | The FindFontconfig module added by 3.14.0 accidentally used uppercase FONTCONFIG_* variable names that do not match our conventions. 3.14.1 revises the module to use Fontconfig_* variable names. This is incompatible with 3.14.0 but since the module is new in the 3.14 series usage should not yet be widespread. (From OE-Core rev: 6c85363eea0278a6952e80edb549e80e1fcbdba7) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: 3.13.4 -> 3.14.0Pascal Bach2019-03-297-26/+27
| | | | | | | | | | | | The copyright date changed in the license file, thus the hash change. CMake 3.14 fixes some issues with implicit include path that lead to errors with gcc not finding "stdlib.h" etc in include_next. (From OE-Core rev: ec2764aa4957b802ed2612dd7633aed5b941bfb0) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: update to 3.13.4Pascal Bach2019-02-145-7/+7
| | | | | | | | | | | | All patches have been rebased on top of the 3.13.4 release. I successfully built all CMake recipes in oe-core and meta-oe. (From OE-Core rev: f40a5da14ec688f751d6394ce9a997578904fd8d) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Cc: Otavio Salvador <otavio.salvador@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake-native: Add --enable-ccache to configure optionsRobert Yang2019-01-261-0/+1
| | | | | | | | | | cmake-native requires --enable-ccache to enable ccache, target recipe doesn't need this since it is already handled by cmake.bbclass. (From OE-Core rev: 815056cb595c0f57b4d8867387420fe3bb28bdb2) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: do not look into native sysroot in the nativesdk environmentAlexander Kanavin2019-01-261-1/+1
| | | | | | | | | | | | | | | | | | I am not sure why we do this in the first place, but it is causing cmake to erroneously pick up items from the native sysroot when building for the target and the target item is missing, for example: https://autobuilder.yoctoproject.org/typhoon/#/builders/59/builds/198/steps/7/logs/step2c Note that for executable programs this variable is not referred to, as set by set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) in the same file. (From OE-Core rev: cd1c0a0631ad128b25e97f047750579caead051a) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake-native: Set --parallel for configureRobert Yang2019-01-031-1/+3
| | | | | | | | | This can save do_configure's time from 330s to 60s on my host. (From OE-Core rev: c22b0bf66a28324da66caf0660f171cc279a1f2b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Upgrade 3.12.1 -> 3.12.2Otavio Salvador2018-09-213-2/+2
| | | | | | | | (From OE-Core rev: a585c51f8107e52cf7fa16b46b889b3f81eca600) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Update 3.11.4 -> 3.12.1Otavio Salvador2018-09-058-30/+32
| | | | | | | | | | | | | | | | This updates CMake to the 3.12.1 stable release. All patches were rebase on top of the new source file and all them applied without changes. The number of patches has changed as all them were applied on the Git tree and re-exported, to avoid any fuzzy warnings. License-Update: new contributor added in Copyright.txt (From OE-Core rev: 439be401cd642937b45796489e8c10aa5238a963) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake-native: fix to function correctly in case of eSDKChen Qi2018-08-231-1/+15
| | | | | | | | | | | | | | | | | | | | Our eSDK is expected to provide traditional SDK's functionality. But for cmake, it could not function well in eSDK. This problem is discovered by the assimp.py test case. The error message is as below. testsdkext/tmp/sysroots/x86_64/usr/lib/libz.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status The problem is about cmake-native being unable to find the correct lib. nativesdk-cmake has solved this problem. So make use of the solution to solve the eSDK problem. (From OE-Core rev: c0561e930e688890eb5feb4521b2de196137227a) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: fix compiling some C++ projects with Yocto SDK and GCCUrs Fässler2018-08-141-0/+1
| | | | | | | | | | | | | Setting CMAKE_SYSROOT in the toolchain file allows CMake to correctly remove user-provided system include directories pointing to <sysroot>/usr/include. The mentioned projects failed with "stdlib.h: No such file or directory #include_next <stdlib.h>". (From OE-Core rev: cb42802f2fe1760f894a435b07286bca3a220364) Signed-off-by: Urs Fässler <urs.fassler@bbv.ch> Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: fix linking in multilib SDKsRoss Burton2018-08-072-0/+3
| | | | | | | | | | | | | | | | | | | CMake, in it's infinite wisdom, when searching for libraries (using find_library) will look inside the libraries PREFIX/lib, PREFIX/lib32, and PREFIX/lib64. In a multilib SDK more than one of these will exist (potentially all three) and obviously for a given build configuration only one of those is valid. This search path is hard-coded deep inside CMake but by setting CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX we can bypass it and set an explicit lib<SUFFIX> to use. Do this by writing ${baselib} into the environment file, and then stripping "lib" from this to obtain the suffix in the cmake-specific environment script, which is then read in the CMake toolchain. (From OE-Core rev: 47160a8c51310f2b40cabf4c1910b5df6e0a15d6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: put cmake.m4 and toolchain file in PNRoss Burton2018-07-261-1/+2
| | | | | | | | | | | | | | | | | 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>
* cmake: in SDK use OE env var to set default toolchainCody P Schafer2018-07-263-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | Patch the location in cmake where the toolchain file is loaded to use the (new) OE_CMAKE_TOOLCHAIN_FILE variable to select a default toolchain if no toolchain has been specified. The cmake alias is removed. The alternatives: - shell alias fails when cmake is called indirectly (ex: a makefile managing several projects which calls cmake for some of them) because aliases are not inherited - wrapper script that unconditionally adds "-D..." breaks cmake's build tests and many other things as it causes cmake to believe it should be configuring things when it should not be. For example, `cmake -DCMAKE_TOOLCHAIN_FILE=... --build .` does not work (note that this also breaks people directly using `cmake --build .` with the current alias). (From OE-Core rev: da60be3768e7183794d63548166d107dbd0a4973) Signed-off-by: Cody P Schafer <dev@codyps.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Update 3.10.3 -> 3.11.4Otavio Salvador2018-07-0615-862/+163
| | | | | | | | | | | This updates CMake to the current stable release and drop many backported patches in the process. (From OE-Core rev: d942ec4ff649782d22afe49fd48839dbbfedc871) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: fix Upstream-Status tag spellingRoss Burton2018-06-156-6/+6
| | | | | | | (From OE-Core rev: a734431a7ce36a679dff81822c2fba6f07a09e88) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: fix build issue with boost 1.67.0Armin Kuster2018-06-074-0/+376
| | | | | | | | | | | this fixes a build issue with boost 1.67.0 [Yocto 12762] (From OE-Core rev: 04f367e27e66105466611bee4d63abc78e0a4725) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: fix build issue with boost 1.66.0Armin Kuster2018-06-075-0/+248
| | | | | | | | | | | this fixes a build issue with boost 1.66.0 [Yocto 12762] (From OE-Core rev: 2ff3d3296deacb9af4d9ad0b92cd7ba5f94b7182) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: upgrade 3.10.2 -> 3.10.3Otavio Salvador2018-04-033-2/+2
| | | | | | | | | | | | | | | | | | | | | ,----[ Changes in 3.10.3 ] | Brad King (1): | CMake 3.10.3 | | Craig Scott (1): | GoogleTest: Rename TIMEOUT parameter to avoid clash | | Sebastian Holtermann (1): | Autogen: Fix for the empty source file crash in 3.10.2 | | Tianhao Chai (1): | ccmake: fix status line buffer overflow on very wide terminals `---- (From OE-Core rev: ae230e1f858f83d1ff063554b49bd3ee1f880f76) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Upgrade 3.10.1 -> 3.10.2Otavio Salvador2018-02-243-2/+2
| | | | | | | | | | | | | | | | | | | | | This is a minor stable update to CMake. This includes following changes: ,---- | c1e087a9d CMake 3.10.2 | d592bfc9f Autogen: Ignore not existing source files in cmMakefile | d49986b3b KWIML: Backport RISC-V update to CMake 3.10 | 9417a6d32 FindPostgreSQL: Add support for PG10 | 683e9023a Autogen: Fix for problematic nested list separator | 9b4d31dc7 cmGraphVizWriter: Updated to create and follow dependers for | interface targets `---- (From OE-Core rev: 798dba6fb3e16d3041b01faecfd32c787c142ee8) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: upgrade 3.9.5 -> 3.10.1Otavio Salvador2018-01-196-77/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | The 3.10.1 version has been in Dec 13, 2017, and has a great set of features and improvements since the last upgrade. The release notes of 3.10 release is available at: https://cmake.org/cmake/help/v3.10/release/3.10.html Patches updates: - cmake-Prevent-the-detection-of-Qt5.patch: so it replaces the sed command calls inside the cmake.inc - 0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch: merged upstream, so it has been removed. - support-oe-qt4-tools-names.patch: rebased. License-checksum-change: added new contributors (From OE-Core rev: 9e58926f1cea9d5cb18cb923855d1ae98f88a8ac) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Upgrade to 3.9.5Otavio Salvador2017-11-113-2/+2
| | | | | | | | (From OE-Core rev: 80d3766aab011979ce01ec295696e4939ce43b87) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Upgrade to 3.9.3 releaseOtavio Salvador2017-11-053-4/+8
| | | | | | | | | | | | This upgrades CMake from 3.8.2 to 3.9.3 release. The Copyright.txt file checksum change was due the addition of a new contributor on the contributors list. (From OE-Core rev: 053ad4bbcb72a1783c7928c2f86285c15472314f) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: fix typo in toolchain fileØystein Walle2017-10-161-1/+1
| | | | | | | | | | | | | | | | | | The missing underscore makes CMake define a new variable named "CMAKE" with the contents "ASM_FLAGS ${CMAKE_C_FLAGS}" instead of a variable named "CMAKE_ASM_FLAGS" with contents equal to "CMAKE_C_FLAGS". It seems clear that the intention was to assign "CMAKE_ASM_FLAGS". CMake uses variables named "CMAKE_<LANG>_FLAGS" for defining default compiler flags for a given language <LANG>. Leaving this flag unset may have unintended consequences. Not doing so is however not an error as far as CMake is concerned so it is silently accepted. (From OE-Core rev: 03a4dd085e3be2821eff5a1a1e7e96b809465565) Signed-off-by: Øystein Walle <ow@datarespons.no> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Use find_program if find_host_program is not availableMaxime Roussin-Bélanger2017-07-062-0/+41
| | | | | | | | | | | | | | CMake does not define the `find_host_program` command we've been using in the cross-compiling code path. It was provided by a widely used Android toolchain file. For compatibility, continue to use `find_host_program` if available, but otherwise use just `find_program`. (From OE-Core rev: e5f4e0df64531e2296bb1f5002eb106c3eec61e3) Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Upgrade to 3.8.2Otavio Salvador2017-06-055-80/+5
| | | | | | | | | | | | | | | | | | | | | There was a set of changes, those are: - CMake now requires librhash for build and as there is no other users in OE-Core we make it use its internal copy instead; - Copyright.txt checksum has change due new contrubutors and 2017 year additions; - Patch avoid-gcc-warnings-with-Wstrict-prototypes.patch was removed as it is not need anymore; - Patch 0001-KWIML-tests-Remove-format-security-from-flags.patch was removed as it is included in this release. (From OE-Core rev: cc75f693bde412edd0a1aa4fd4e92fb29b492b76) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Backport fix to enable -Wformat-securityJussi Kukkonen2017-03-172-0/+34
| | | | | | | | | | Backport build fix that removes -Wformat-security for specific tests. Enable "-Wformat-security" for cmake in security_flags.inc. (From OE-Core rev: b00f9c77ebd211578ba133c28abcbc5752305e25) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: start to ignore the largefile distro featureAndre McCurdy2017-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | The largefile distro feature has been enabled by default in oe-core for a long time and, more recently, also in poky-tiny. Building without the largefile distro feature receives little or no testing. Many packages now enable LFS without exposing a configure option, so there should be very little expectation that disabling the distro feature will result in a distro which globally disables LFS. Respecting the distro feature adds a maintenance over-head and may be the source of configurations oddities (e.g. dbus-native currently builds with LFS disabled for no clear reason - fixed by this commit). Ignore the largefile distro feature more widely, as a first step towards deprecating and eventually removing it. (From OE-Core rev: a75ccaea77c8aad8d46e87e8ed4af2e2e0ad5327) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Update to 3.7.2.Philip Balister2017-02-233-2/+2
| | | | | | | | | | | | Tested by building gnuradio stack. (From OE-Core rev: d3e5a6d38870ecede87812cb81c0b5630bd3b3ff) (From OE-Core rev: 66122e4f19e880f5e48130b318f98452b992cad4) 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>
* cmake: update to 3.7.1Alexander Kanavin2016-12-173-2/+2
| | | | | | | | | | (From OE-Core rev: 1e15dea62cacdd5c3c1158962a55ca44cfb1726b) (From OE-Core rev: 76e5ecbe75c6ef06af7dd662625631399cbbde0f) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: remove True option to getVar callsJoshua Lock2016-12-162-3/+3
| | | | | | | | | | | | | getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: update to 3.7.0Alexander Kanavin2016-11-303-4/+6
| | | | | | | | | | License is still 3-clause BSD. (From OE-Core rev: f9abf70ef9e55be4bdbf90836a8ba083210f82ad) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: update to 3.6.2Alexander Kanavin2016-10-283-2/+2
| | | | | | | | (From OE-Core rev: 596f997acf3c86482fb1dd59b2cd0c0b9af58e84) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: avoid configure failures if CFLAGS contains -Wstrict-prototypesAndre McCurdy2016-10-282-0/+43
| | | | | | | | (From OE-Core rev: 0c89b010ce2e426f55ac7c6f94befef988913834) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: improve CMAKE_SYSTEM_PROCESSOR assignment in nativesdkRoss Burton2016-10-151-2/+4
| | | | | | | | | | | | | | 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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: also set CMAKE_FIND_ROOT_PATH_MODE_PACKAGERoss Burton2016-10-151-0/+2
| | | | | | | | | | | 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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake: Use bb.fatal() instead of raising FuncFailedUlf Magnusson2016-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | 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 <ulfalizer@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake-native: prefer native sysroot libraries over hostRoss Burton2016-09-231-1/+2
| | | | | | | | | | | | | 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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmake-native: rationalise system/internal library dependenciesRoss Burton2016-09-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>