[PATCH 1/2] cmake: allow the generator to be changed

[PATCH 1/2] cmake: allow the generator to be changed

[Ross Burton]

Add OECMAKE_GENERATOR variable to control which generator is used by CMake,
defaulting to the upstream default of Unix Makefiles for now.  The other
supported option is Ninja, which is faster than Make for large projects (for
example, using Ninja takes three minutes off webkitgtk:do_compile for me).

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/cmake.bbclass | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 55698e60e53..74a952142ff 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -7,6 +7,23 @@ B = "${WORKDIR}/build"
 # We need to unset CCACHE otherwise cmake gets too confused
 CCACHE = ""
 
+# What CMake generator to use.
+# The supported options are "Unix Makefiles" or "Ninja".
+OECMAKE_GENERATOR ?= "Unix Makefiles"
+
+python() {
+    generator = d.getVar("OECMAKE_GENERATOR")
+    if generator == "Unix Makefiles":
+        args = "-G 'Unix Makefiles' -DCMAKE_MAKE_PROGRAM=" + d.getVar("MAKE")
+        d.setVar("OECMAKE_GENERATOR_ARGS", args)
+        d.setVarFlag("do_compile", "progress", "percent")
+    elif generator == "Ninja":
+        d.appendVar("DEPENDS", " ninja-native")
+        d.setVar("OECMAKE_GENERATOR_ARGS", "-G Ninja -DCMAKE_MAKE_PROGRAM=ninja")
+        d.setVarFlag("do_compile", "progress", "outof:^\[(\d+)/(\d+)\]\s+")
+    else:
+        bb.fatal("Unknown CMake Generator %s" % generator)
+}
 # C/C++ Compiler (without cpu arch/tune arguments)
 OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`"
 OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`"
@@ -121,9 +138,9 @@ cmake_do_configure() {
 	fi
 
 	cmake \
+	  ${OECMAKE_GENERATOR_ARGS} \
 	  $oecmake_sitefile \
 	  ${OECMAKE_SOURCEPATH} \
-	  -DCMAKE_MAKE_PROGRAM=${MAKE} \
 	  -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
 	  -DCMAKE_INSTALL_BINDIR:PATH=${@os.path.relpath(d.getVar('bindir'), d.getVar('prefix'))} \
 	  -DCMAKE_INSTALL_SBINDIR:PATH=${@os.path.relpath(d.getVar('sbindir'), d.getVar('prefix'))} \
@@ -142,7 +159,6 @@ cmake_do_configure() {
 	  -Wno-dev
 }
 
-do_compile[progress] = "percent"
 cmake_do_compile()  {
 	bbnote VERBOSE=1 cmake --build '${B}' --target ${OECMAKE_TARGET_COMPILE} -- ${EXTRA_OECMAKE_BUILD}
 	VERBOSE=1 cmake --build '${B}' --target ${OECMAKE_TARGET_COMPILE} -- ${EXTRA_OECMAKE_BUILD}
-- 
2.11.0

[PATCH 2/2] cmake: use Ninja by default

[Ross Burton]

This changes the cmake class to use Ninja instead of Make by default.

If a recipe is broken with Ninja then the recipe can set OECMAKE_GENERATOR="Unix
Makefiles" to change back to Make.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/cmake.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 74a952142ff..d60dad8d66b 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -9,7 +9,7 @@ CCACHE = ""
 
 # What CMake generator to use.
 # The supported options are "Unix Makefiles" or "Ninja".
-OECMAKE_GENERATOR ?= "Unix Makefiles"
+OECMAKE_GENERATOR ?= "Ninja"
 
 python() {
     generator = d.getVar("OECMAKE_GENERATOR")
-- 
2.11.0

Re: [PATCH 2/2] cmake: use Ninja by default

[Otavio Salvador]

On Thu, Jan 18, 2018 at 10:38 AM, Ross Burton <ross.burton@intel.com> wrote:
> This changes the cmake class to use Ninja instead of Make by default.
>
> If a recipe is broken with Ninja then the recipe can set OECMAKE_GENERATOR="Unix
> Makefiles" to change back to Make.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>



-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 2/2] cmake: use Ninja by default

[Böszörményi Zoltán]

2018-01-18 13:38 keltezéssel, Ross Burton írta:
> This changes the cmake class to use Ninja instead of Make by default.

Can we still use "oe_runmake [-C subdir] target" with Ninja or
is it considered a broken build and forced to use the "Unix Makefiles" generator?
I have a working mariadb 10.2.12 recipe and the native build is trimmed down
to the absolute necessary pieces:

oe_runmake import_executables
oe_runmake -C libmariadb

Best regards,
Zoltán Böszörményi

> If a recipe is broken with Ninja then the recipe can set OECMAKE_GENERATOR="Unix
> Makefiles" to change back to Make.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/classes/cmake.bbclass | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
> index 74a952142ff..d60dad8d66b 100644
> --- a/meta/classes/cmake.bbclass
> +++ b/meta/classes/cmake.bbclass
> @@ -9,7 +9,7 @@ CCACHE = ""
>   
>   # What CMake generator to use.
>   # The supported options are "Unix Makefiles" or "Ninja".
> -OECMAKE_GENERATOR ?= "Unix Makefiles"
> +OECMAKE_GENERATOR ?= "Ninja"
>   
>   python() {
>       generator = d.getVar("OECMAKE_GENERATOR")
> 

Re: [PATCH 2/2] cmake: use Ninja by default

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 930 bytes --]

On 18 January 2018 at 15:02, Böszörményi Zoltán <zboszor@pr.hu> wrote:

> 2018-01-18 13:38 keltezéssel, Ross Burton írta:
>
>> This changes the cmake class to use Ninja instead of Make by default.
>>
>
> Can we still use "oe_runmake [-C subdir] target" with Ninja or
> is it considered a broken build and forced to use the "Unix Makefiles"
> generator?
> I have a working mariadb 10.2.12 recipe and the native build is trimmed
> down
> to the absolute necessary pieces:
>
> oe_runmake import_executables
> oe_runmake -C libmariadb
>

Because you're doing -C I suspect you'll need to force it to use makefiles
explicitly, but you can tell cmake what targets to build and the target
names are universal so if you can find a way of doing that without -C then
you can tell cmake to build the specific targets (OECMAKE_TARGET_COMPILE
and _INSTALL)  and then the choice of generator doesn't matter.

Ross

[-- Attachment #2: Type: text/html, Size: 1433 bytes --]

Re: [PATCH 2/2] cmake: use Ninja by default

[Alejandro Enedino Hernandez Samaniego]

On 01/18/2018 04:38 AM, Ross Burton wrote:
> This changes the cmake class to use Ninja instead of Make by default.
>
> If a recipe is broken with Ninja then the recipe can set OECMAKE_GENERATOR="Unix
> Makefiles" to change back to Make.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/classes/cmake.bbclass | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
> index 74a952142ff..d60dad8d66b 100644
> --- a/meta/classes/cmake.bbclass
> +++ b/meta/classes/cmake.bbclass
> @@ -9,7 +9,7 @@ CCACHE = ""
>   
>   # What CMake generator to use.
>   # The supported options are "Unix Makefiles" or "Ninja".
> -OECMAKE_GENERATOR ?= "Unix Makefiles"
> +OECMAKE_GENERATOR ?= "Ninja"
>   
>   python() {
>       generator = d.getVar("OECMAKE_GENERATOR")

Awesome, testing it now!

Alejandro

✗ patchtest: failure for "cmake: allow the generator to ..." and 1 more

[Patchwork]

== Series Details ==

Series: "cmake: allow the generator to ..." and 1 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/10601/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 6b87ad5b08)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH 1/2] cmake: allow the generator to be changed

[Otavio Salvador]

On Thu, Jan 18, 2018 at 10:38 AM, Ross Burton <ross.burton@intel.com> wrote:
> Add OECMAKE_GENERATOR variable to control which generator is used by CMake,
> defaulting to the upstream default of Unix Makefiles for now.  The other
> supported option is Ninja, which is faster than Make for large projects (for
> example, using Ninja takes three minutes off webkitgtk:do_compile for me).
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750