diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-14 18:39:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-14 18:39:20 (GMT) |
| commit | 8a205b980c8dc088aa2c9f91adb90d57a65fa560 (patch) | |
| tree | 5b631a4434a072c0939ddbf85c8f2444ffb8888b /Source/cmTarget.cxx | |
| parent | d57be904ae997e44ec9ac3b44722277f81936577 (diff) | |
| download | CMake-8a205b980c8dc088aa2c9f91adb90d57a65fa560.zip CMake-8a205b980c8dc088aa2c9f91adb90d57a65fa560.tar.gz CMake-8a205b980c8dc088aa2c9f91adb90d57a65fa560.tar.bz2 | |
cmTarget: Compile old-style link dependencies only for VS 6
Compile all the "ForVS6" cmTarget members only on Windows. No other
platforms support the VS 6 generator.
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 0d17dc2..aaae457 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -258,7 +258,9 @@ cmTarget::cmTarget() #undef INITIALIZE_TARGET_POLICY_MEMBER this->Makefile = 0; +#if defined(_WIN32) && !defined(__CYGWIN__) this->LinkLibrariesForVS6Analyzed = false; +#endif this->HaveInstallRule = false; this->DLLPlatform = false; this->IsApple = false; @@ -517,11 +519,13 @@ void cmTarget::FinishConfigure() // invalidation code in this source file is buggy. this->ClearLinkMaps(); +#if defined(_WIN32) && !defined(__CYGWIN__) // Do old-style link dependency analysis only for CM_USE_OLD_VS6. if(this->Makefile->GetLocalGenerator()->GetGlobalGenerator()->IsForVS6()) { this->AnalyzeLibDependenciesForVS6(*this->Makefile); } +#endif } //---------------------------------------------------------------------------- @@ -1335,7 +1339,9 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf, cmTarget::LibraryID tmp; tmp.first = lib; tmp.second = llt; +#if defined(_WIN32) && !defined(__CYGWIN__) this->LinkLibrariesForVS6.push_back( tmp ); +#endif this->OriginalLinkLibraries.push_back(tmp); this->ClearLinkMaps(); @@ -1401,6 +1407,7 @@ cmTarget::AddSystemIncludeDirectories(const std::vector<std::string> &incs) } } +#if defined(_WIN32) && !defined(__CYGWIN__) //---------------------------------------------------------------------------- void cmTarget::AnalyzeLibDependenciesForVS6( const cmMakefile& mf ) @@ -1693,6 +1700,7 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf, this->DeleteDependencyForVS6( dep_map, lib, lib); } } +#endif //---------------------------------------------------------------------------- static bool whiteListedInterfaceProperty(const std::string& prop) |