summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-03 14:46:20 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-02-03 14:46:20 (GMT)
commit99e3650e66399e75efb989322d4b0146c549dbfa (patch)
tree2b9dc3d93cba29c89dfe15c7b5fbdda1e2fdf357 /Source
parent1acf36241fee134faed4355be2c9b5afa5500714 (diff)
parent3cec0c75f73cc3d5c68cbb9e03e94ed38d60d0a9 (diff)
downloadCMake-99e3650e66399e75efb989322d4b0146c549dbfa.zip
CMake-99e3650e66399e75efb989322d4b0146c549dbfa.tar.gz
CMake-99e3650e66399e75efb989322d4b0146c549dbfa.tar.bz2
Merge topic 'make-NOTPARALLEL-not-PHONY'
3cec0c75 Makefile: Generate .NOTPARALLEL without .PHONY (#14312)
Diffstat (limited to 'Source')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index f825f5f..fbf2140 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1826,7 +1826,7 @@ void cmLocalUnixMakefileGenerator3
std::vector<std::string> no_depends;
this->WriteMakeRule(ruleFileStream,
"Allow only one \"make -f Makefile2\" at a time, but pass parallelism.",
- ".NOTPARALLEL", no_depends, no_commands, true);
+ ".NOTPARALLEL", no_depends, no_commands, false);
}
}