diff options
| author | David Cole <david.cole@kitware.com> | 2011-08-25 19:41:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-08-25 19:41:02 (GMT) |
| commit | 7b0cf28ccf7bfb0192ad506d663be55c1dcdec84 (patch) | |
| tree | 3be1545a40b1a8a0bd6d017a06707cc66929deae /Source | |
| parent | 9df6a6078b9eeecb3dfbed82c1ce761f0dedae06 (diff) | |
| parent | 281f51e063c2f3245d11b085c06a7f4b5fe69fd3 (diff) | |
| download | CMake-7b0cf28ccf7bfb0192ad506d663be55c1dcdec84.zip CMake-7b0cf28ccf7bfb0192ad506d663be55c1dcdec84.tar.gz CMake-7b0cf28ccf7bfb0192ad506d663be55c1dcdec84.tar.bz2 | |
Merge topic 'fix_nmake_var_plus'
281f51e Fix for bug #12413, nmake did not handle targets with + in the name.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 6ab5c2a..2eae9d0 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1276,6 +1276,7 @@ cmLocalUnixMakefileGenerator3 // and there are no "." charactors in the string, then return the // unmodified combination. if((!this->MakefileVariableSize && unmodified.find('.') == s.npos) + && (!this->MakefileVariableSize && unmodified.find('+') == s.npos) && (!this->MakefileVariableSize && unmodified.find('-') == s.npos)) { return unmodified; @@ -1297,6 +1298,7 @@ cmLocalUnixMakefileGenerator3 { cmSystemTools::ReplaceString(ret, ".", "_"); cmSystemTools::ReplaceString(ret, "-", "__"); + cmSystemTools::ReplaceString(ret, "+", "___"); int ni = 0; char buffer[5]; // make sure the _ version is not already used, if |