Commit Graph

22 Commits

Author SHA1 Message Date
Jussi Kukkonen 6dcf5c6e6e cmake: Backport fix to enable -Wformat-security
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>
2017-03-17 16:53:04 +00:00
Andre McCurdy 5bfc112449 cmake: avoid configure failures if CFLAGS contains -Wstrict-prototypes
(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>
2016-10-28 16:15:18 +01:00
Ross Burton 4e1b9d5902 cmake: improve CMAKE_SYSTEM_PROCESSOR assignment in nativesdk
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>
2016-10-15 10:01:42 +01:00
Ross Burton 62a01634c5 cmake: also set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
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>
2016-10-15 10:01:42 +01:00
Maxin B. John 2c1aa9c960 cmake: update to 3.5.2
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

(From OE-Core rev: 05bce1fda9b24f939d211516ad73984ad29ba4df)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-22 16:11:13 +01:00
Robert Yang 064ebd5f71 cmake: remove unused dont-run-cross-binaries.patch
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.

(From OE-Core rev: b99eec460cb14dce3580b8f5da6ce8b97d2078c5)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-06 22:57:25 +01:00
Marek Vasut b4f6950451 cmake: Add nios2 support
Add the necessary bits for nios2 support into cmake.

(From OE-Core rev: f6217be489d03cd72655f9457d4e7e21a097a9a7)

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-09 08:48:26 +00:00
Moritz Blume f8661aaeba cmake: Upgrade 2.8.12.2 -> 3.2.2
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.

(From OE-Core rev: c171909352b5ed92166857b0bbcd901ae0f74996)

Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-27 22:42:52 +01:00
Paul Eggleton 0ed19834b2 cmake: drop already applied patches
These patches were part of the 2.8.11 release.

(From OE-Core rev: cd9127664d77df995037bdcff53053835ef026ee)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-11-20 14:09:02 +00:00
Otavio Salvador dacc4ce59e nativesdk-cmake: Adjust toolchain paths dynamically
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.

(From OE-Core rev: 4143f3b0ce0d0c52f5b0babc1bb16ac0ac9610eb)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-10-24 21:59:46 +01:00
Mike Crowe c0ac09ab49 cmake: Improve method for not building ccmake
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 "--".

(From OE-Core rev: eaf176eaabb4c558ad76512b30b28ec97fd90bc6)

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-08 17:45:08 +01:00
Mike Crowe 85783e56e4 cmake-native: Stop building ccmake
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.

(From OE-Core rev: 4bee0a93ed985b38c6b4eb605d8e16f5d7c82d51)

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-04 11:53:51 +01:00
Martin Jansa 56236e74f0 cmake: Fix freetype detection
* since last freetype upgrade cmake cannot detect it
* e.g. webkit-efl requires freetype and is failing because of this

(From OE-Core rev: 0cd58eb1ca29bdc53f623aba1f761b97cfe31fb4)

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-01-28 00:52:32 +00:00
Paul Eggleton 1db33e3c4d cmake-native: fix dependencies
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.

(From OE-Core rev: fe6ca47a256b775e1aa5750b9dd31e27230cf781)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-17 20:53:20 +01:00
Paul Eggleton 09fea03644 cmake: fix configure error if system Qt installation is broken
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].

(From OE-Core rev: 2bf46fbd25e1a3a44d556758f536fa26c44edb03)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-10 09:42:00 +01:00
Saul Wold 24380e2be9 cmake: Update to 2.8.11
Rebased support-oe-qt4-tools-names as some of the changes where
added in the upstream code.

(From OE-Core rev: 13399264e987b698b120688dc5018adb3fa8522d)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-24 14:14:42 +01:00
Saul Wold ea89950ba8 Upstream-Status: Correct Capitalization
(From OE-Core rev: 43b2a2f375e2201be7a9bb6a9c5c0a9fc61f3361)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-12 09:37:31 +01:00
Marcin Juszkiewicz dd98eeaf4c cmake: add AArch64 support
(From OE-Core rev: 73dd5842a945e119c8870929e9d71067235a9247)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-07 13:38:29 +00:00
Saul Wold 7a697d0709 cmake: Update to 2.8.10.1
(From OE-Core rev: b109a6e33fc7748de65d1ff76528b302e7f92dd8)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-03 14:32:47 +00:00
Otavio Salvador fb24f9b37c cmake: update to 2.8.5-rc3
(From OE-Core rev: 2b229f4150b8375f0d35e11464dcbe307b720d81)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-08 17:20:58 +01:00
Otavio Salvador 4832e84106 cmake: add nativesdk and target versions
Adds a recipe that provides the nativesdk and target versions of
CMake.

This recipe is based on code from OpenEmbeeded (rev
b1f2e1501c19540617a829b37415c0616101c7ad).

(From OE-Core rev: ea25292bbf53c7542578e5d9f4ae0531f9d78374)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-08 17:20:57 +01:00
Otavio Salvador aa721aa065 cmake: add support for oe qt4 tools names
The FindQt4 module looks for Qt4 binaries to be able to gather the
paths used for compilation and also to be using during other processes
(translation update, translation binary generating and like) however
OpenEmbedded has renamed those to allow old QMake to be used in
parallel with the current one. This patch adds support for the
OpenEmbedded specific binary names.

(From OE-Core rev: 6317c91aacf55cd7757a4fad0346cb541e9a1c2b)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-16 16:08:53 +01:00