From 58417c28dee15f687f4ca90bab22fcdea43516fd Mon Sep 17 00:00:00 2001
From: Satadru Pramanik <satadru@umich.edu>
Date: Wed, 5 Jan 2022 10:32:08 -0500
Subject: [PATCH] Fix '-j#' regex addition by excluding lines w/ cmake (#6555)

* Fix '-j#' regex addition by excluding lines w/ cmake

* bump version
---
 lib/const.rb   | 2 +-
 lib/package.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/const.rb b/lib/const.rb
index 1c512fbab..6620a1d85 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -1,6 +1,6 @@
 # Defines common constants used in different parts of crew
 
-CREW_VERSION = '1.20.5'
+CREW_VERSION = '1.20.6'
 
 ARCH_ACTUAL = `uname -m`.chomp
 # This helps with virtualized builds on aarch64 machines
diff --git a/lib/package.rb b/lib/package.rb
index 58bd3d463..34a88dc66 100644
--- a/lib/package.rb
+++ b/lib/package.rb
@@ -134,7 +134,7 @@ class Package
     cmd_args = args.join(' ')
 
     # Add -j arg to build commands.
-    cmd_args.sub!(/\b(?<=make)(?=\b)/, " -j#{CREW_NPROC}") unless cmd_args =~ /-j\s*\d+/
+    cmd_args.sub!(/\b(?<=make)(?=\b)/, " -j#{CREW_NPROC}") unless cmd_args =~ /-j\s*\d+|cmake/
 
     begin
       Kernel.system(env, cmd_args, **opt_args)