summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio7Generator.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2002-09-13 14:42:50 (GMT)
committerKen Martin <ken.martin@kitware.com>2002-09-13 14:42:50 (GMT)
commit6132184cc3a3832463308fa45d7fda17f3df067e (patch)
tree59c853ecf53c4332fc28b5fec6061ba8690e6212 /Source/cmGlobalVisualStudio7Generator.cxx
parentc1da4c9570d57f641f35038bbadb926398d4236c (diff)
downloadCMake-6132184cc3a3832463308fa45d7fda17f3df067e.zip
CMake-6132184cc3a3832463308fa45d7fda17f3df067e.tar.gz
CMake-6132184cc3a3832463308fa45d7fda17f3df067e.tar.bz2
better trycompile and enable langiages
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx31
1 files changed, 13 insertions, 18 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 01ab1ba..bd2adb3 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -23,25 +23,20 @@
void cmGlobalVisualStudio7Generator::EnableLanguage(const char*,
cmMakefile *mf)
{
- if (!m_LanguagesEnabled)
+ // now load the settings
+ if(!mf->GetDefinition("CMAKE_ROOT"))
{
- m_LanguagesEnabled = true;
-
- // now load the settings
- if(!mf->GetDefinition("CMAKE_ROOT"))
- {
- cmSystemTools::Error(
- "CMAKE_ROOT has not been defined, bad GUI or driver program");
- return;
- }
- if(!this->GetLanguageEnabled("CXX"))
- {
- std::string fpath =
- mf->GetDefinition("CMAKE_ROOT");
- fpath += "/Templates/CMakeDotNetSystemConfig.cmake";
- mf->ReadListFile(NULL,fpath.c_str());
- this->SetLanguageEnabled("CXX");
- }
+ cmSystemTools::Error(
+ "CMAKE_ROOT has not been defined, bad GUI or driver program");
+ return;
+ }
+ if(!this->GetLanguageEnabled("CXX"))
+ {
+ std::string fpath =
+ mf->GetDefinition("CMAKE_ROOT");
+ fpath += "/Templates/CMakeDotNetSystemConfig.cmake";
+ mf->ReadListFile(NULL,fpath.c_str());
+ this->SetLanguageEnabled("CXX");
}
}