diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2018-01-17 13:59:33 -0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-19 12:37:13 +0000 |
commit | b96f5db544a0f2e1f36ab7bd7032b9d4d5adaca6 (patch) | |
tree | 11388a43d5b3aa46d75ac0305cf2b6f5d8eabec1 /meta/classes/cmake.bbclass | |
parent | b0e9cf7ee4764a345926310b2793aa51c2e1c3d0 (diff) | |
download | poky-b96f5db544a0f2e1f36ab7bd7032b9d4d5adaca6.tar.gz |
cmake: upgrade 3.9.5 -> 3.10.1
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>
Diffstat (limited to 'meta/classes/cmake.bbclass')
-rw-r--r-- | meta/classes/cmake.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 10c4edcf1a..55698e60e5 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass | |||
@@ -123,6 +123,7 @@ cmake_do_configure() { | |||
123 | cmake \ | 123 | cmake \ |
124 | $oecmake_sitefile \ | 124 | $oecmake_sitefile \ |
125 | ${OECMAKE_SOURCEPATH} \ | 125 | ${OECMAKE_SOURCEPATH} \ |
126 | -DCMAKE_MAKE_PROGRAM=${MAKE} \ | ||
126 | -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ | 127 | -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ |
127 | -DCMAKE_INSTALL_BINDIR:PATH=${@os.path.relpath(d.getVar('bindir'), d.getVar('prefix'))} \ | 128 | -DCMAKE_INSTALL_BINDIR:PATH=${@os.path.relpath(d.getVar('bindir'), d.getVar('prefix'))} \ |
128 | -DCMAKE_INSTALL_SBINDIR:PATH=${@os.path.relpath(d.getVar('sbindir'), d.getVar('prefix'))} \ | 129 | -DCMAKE_INSTALL_SBINDIR:PATH=${@os.path.relpath(d.getVar('sbindir'), d.getVar('prefix'))} \ |