summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-12-20 14:41:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-12-20 14:41:32 (GMT)
commit7974dced73a9efaf2b268f8c3a647054c75ff401 (patch)
tree1558db8aaf8ae3636e919ab6af9c9e5578fbcaed /Source/cmGlobalUnixMakefileGenerator3.h
parent6f29fdd7cd1272f0714fce5028ff9d73e9805ea6 (diff)
parentbd11de085757f170c5880d99291048b9f512a120 (diff)
downloadCMake-7974dced73a9efaf2b268f8c3a647054c75ff401.zip
CMake-7974dced73a9efaf2b268f8c3a647054c75ff401.tar.gz
CMake-7974dced73a9efaf2b268f8c3a647054c75ff401.tar.bz2
Merge topic 'make-entry-no-parallel'
bd11de0 Makefile: Allow "gmake target1 target2 -j" (#14312)
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.h')
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 986d1d7..00a86eb 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -125,6 +125,9 @@ public:
const std::string &workingDirectory,
const std::string &compileCommand);
+ /** Does the make tool tolerate .NOTPARALLEL? */
+ virtual bool AllowNotParallel() const { return true; }
+
protected:
void WriteMainMakefile2();
void WriteMainCMakefile();