diff options
| author | Brad King <brad.king@kitware.com> | 2009-07-03 14:33:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-07-03 14:33:34 (GMT) |
| commit | 44021718a6358d8b93168b04e2c457d8799182b8 (patch) | |
| tree | f9676d3827526f850a0b58ce589d8753b6b3872f | |
| parent | 11d1063452178b00ac66304da337c1cb56dfa469 (diff) | |
| download | CMake-44021718a6358d8b93168b04e2c457d8799182b8.zip CMake-44021718a6358d8b93168b04e2c457d8799182b8.tar.gz CMake-44021718a6358d8b93168b04e2c457d8799182b8.tar.bz2 | |
STYLE: Replace large if() with named boolean
In cmLocalVisualStudio{6,7}Generator this replaces a large if() test
with a re-usable result stored in a boolean variable named accordingly.
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index 768550f..bcd908e 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -885,6 +885,8 @@ void cmLocalVisualStudio6Generator // Lookup the output directory for the target. std::string outPath = target.GetDirectory(); + bool targetBuilds = (target.GetType() >= cmTarget::EXECUTABLE && + target.GetType() <= cmTarget::MODULE_LIBRARY); #ifdef CM_USE_OLD_VS6 // Lookup the library and executable output directories. std::string libPath; @@ -1136,8 +1138,7 @@ void cmLocalVisualStudio6Generator } // Get standard libraries for this language. - if(target.GetType() >= cmTarget::EXECUTABLE && - target.GetType() <= cmTarget::MODULE_LIBRARY) + if(targetBuilds) { // Get the language to use for linking. const char* linkLanguage = diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index d3a5c54..397c02f 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -627,6 +627,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, // 10 == utility const char* configType = "10"; const char* projectType = 0; + bool targetBuilds = true; switch(target.GetType()) { case cmTarget::STATIC_LIBRARY: @@ -645,6 +646,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, case cmTarget::GLOBAL_TARGET: configType = "10"; default: + targetBuilds = false; break; } if(this->FortranProject && projectType) @@ -801,10 +803,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n"); fout << "\t\t\t\tAssemblerListingLocation=\"" << configName << "\"\n"; fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n"; - if(target.GetType() == cmTarget::EXECUTABLE || - target.GetType() == cmTarget::STATIC_LIBRARY || - target.GetType() == cmTarget::SHARED_LIBRARY || - target.GetType() == cmTarget::MODULE_LIBRARY) + if(targetBuilds) { // We need to specify a program database file name even for // non-debug configurations because VS still creates .idb files. |