diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-23 18:30:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-23 18:30:55 (GMT) |
| commit | 09af624deefa6d88e6d13d6a13907e7caf965d25 (patch) | |
| tree | 8b240ad61a6fe41b90901ab59fe361369f42b6af /Source/cmLocalGenerator.cxx | |
| parent | 865c2bc6d657fc79df96b74ca9d1b1eb26f0bbc6 (diff) | |
| download | CMake-09af624deefa6d88e6d13d6a13907e7caf965d25.zip CMake-09af624deefa6d88e6d13d6a13907e7caf965d25.tar.gz CMake-09af624deefa6d88e6d13d6a13907e7caf965d25.tar.bz2 | |
BUG: Fix generation of Watcom link lines.
- Work-around bug in Watcom command line parsing for spaces in paths.
- Add 'library' option before libraries specified by file path.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 62245fe..f49e1bd 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1454,10 +1454,9 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs, std::string cmLocalGenerator::ConvertToLinkReference(std::string const& lib) { #if defined(_WIN32) && !defined(__CYGWIN__) - // Work-ardound MSVC 6 command line bug. This block is only needed - // on windows when we are really using the MSVC 6.0 compiler command - // line. - if(this->Makefile->IsOn("MSVC60")) + // Work-ardound command line parsing limitations in MSVC 6.0 and + // Watcom. + if(this->Makefile->IsOn("MSVC60") || this->Makefile->IsOn("WATCOM")) { // Search for the last space. std::string::size_type pos = lib.rfind(' '); |