diff options
| author | Brad King <brad.king@kitware.com> | 2009-06-10 17:02:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-06-10 17:02:18 (GMT) |
| commit | b5394e96005b7c2e285eb34196c27555b0ba3a7a (patch) | |
| tree | 1b84a0460890e8c4fbf43609277f068dd0204de9 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 057400d9b4d390b523bd37b7baf99b0285bcde92 (diff) | |
| download | CMake-b5394e96005b7c2e285eb34196c27555b0ba3a7a.zip CMake-b5394e96005b7c2e285eb34196c27555b0ba3a7a.tar.gz CMake-b5394e96005b7c2e285eb34196c27555b0ba3a7a.tar.bz2 | |
BUG: Avoid std::unique algorithm on VMS
The Compaq compiler's std::unique algorithm followed by deletion of the
extra elements seems to crash. For now we'll accept the duplicate
dependencies on this platform.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index ca4c1aa3..2a97398 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -303,9 +303,11 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile() } // Sort the list and remove duplicates. std::sort(lfiles.begin(), lfiles.end(), std::less<std::string>()); +#if !defined(__VMS) // The Compaq STL on VMS crashes, so accept duplicates. std::vector<std::string>::iterator new_end = std::unique(lfiles.begin(),lfiles.end()); lfiles.erase(new_end, lfiles.end()); +#endif // reset lg to the first makefile lg = static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[0]); |