diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 9 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 12 |
2 files changed, 12 insertions, 9 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 2ab00a6..e739ee9 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -479,15 +479,6 @@ int cmGlobalGenerator::TryCompile(const char *, const char *bindir, { makeCommand += " "; makeCommand += target; -#if defined(_WIN32) || defined(__CYGWIN__) - std::string tmp = target; - // if the target does not already end in . something - // then assume .exe - if(tmp.size() < 4 || tmp[tmp.size()-4] != '.') - { - makeCommand += ".exe"; - } -#endif // WIN32 } else { diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 7624136..16724f5 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -1261,6 +1261,9 @@ void cmLocalUnixMakefileGenerator::OutputLibraryRule(std::ostream& fout, depend.c_str(), commands); } + + // Add a target with the canonical name (no prefix, suffix or path). + this->OutputMakeRule(fout, comment, name, tgt.c_str(), 0); } void cmLocalUnixMakefileGenerator::OutputSharedLibraryRule(std::ostream& fout, @@ -1537,6 +1540,15 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout, depend.c_str(), commands); } + + // Add a target with the canonical name (no prefix, suffix or path). + // Note that on some platforms the "local target" added above will + // actually be the canonical name and will have set "target" + // correctly. Do not duplicate this target. + if(target != name) + { + this->OutputMakeRule(fout, comment.c_str(), name, target.c_str(), 0); + } } |