From e9f9ac51bded33e24a15378a1754de6aa985a2b6 Mon Sep 17 00:00:00 2001
From: japm48 <japm48@users.noreply.github.com>
Date: Fri, 17 Apr 2020 05:06:10 +0200
Subject: grc: use cmake --build instead of make
This allows the use of other toolchains (ninja, MSVC, etc.).
Also, use all available CPU cores (equivalent of "make -j$(nproc)").
---
grc/gui/Executor.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'grc/gui/Executor.py')
diff --git a/grc/gui/Executor.py b/grc/gui/Executor.py
index 7b4e006f3c..3d10f869aa 100644
--- a/grc/gui/Executor.py
+++ b/grc/gui/Executor.py
@@ -17,6 +17,7 @@ from distutils.spawn import find_executable
from gi.repository import GLib
from ..core import Messages
+from . import Utils
class ExecFlowGraphThread(threading.Thread):
@@ -87,7 +88,9 @@ class ExecFlowGraphThread(threading.Thread):
xterm_executable = find_executable(self.xterm_executable)
- run_command_args = f'cmake .. && make && cd ../.. && {xterm_executable} -e {run_command}'
+ nproc = Utils.get_cmake_nproc()
+
+ run_command_args = f'cmake .. && cmake --build . -j{nproc} && cd ../.. && {xterm_executable} -e {run_command}'
Messages.send_start_exec(run_command_args)
return subprocess.Popen(
--
cgit v1.2.3