diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-21 14:44:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-21 14:44:08 (GMT) |
| commit | 781c34197b869aeb9286660dd2456a8d813f4552 (patch) | |
| tree | ca0b88d5eb2054a6700f73f926564824a2ee7722 /Source | |
| parent | 5968785b2f32a50b2c957da4dc49b257913853ce (diff) | |
| parent | a798bb7074dd45e4e375a3df69d08f62a17ab2ab (diff) | |
| download | CMake-781c34197b869aeb9286660dd2456a8d813f4552.zip CMake-781c34197b869aeb9286660dd2456a8d813f4552.tar.gz CMake-781c34197b869aeb9286660dd2456a8d813f4552.tar.bz2 | |
Merge topic 'fix-9963'
a798bb7 Avoid CustomCommand test failure on VS71 (#9963)
9b4ab06 Avoid CustomCommand test failure on VS71 (#9963)
9d2e648 No extra spaces in CustomCommand test (#9963)
269a4b8 Enable calling commands with : in argv[1] (#9963)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 004d19a..f04d0a0 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1062,9 +1062,16 @@ cmLocalUnixMakefileGenerator3 } } } - if (useCall && launcher.empty()) + if (launcher.empty()) { - cmd = "call " + cmd; + if (useCall) + { + cmd = "call " + cmd; + } + else if (this->NMake && cmd[0]=='"') + { + cmd = "echo >nul && " + cmd; + } } commands1.push_back(cmd); } |