diff options
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index d437899940..ea5aaec915 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -117,6 +117,7 @@ void cmLocalGenerator::SetGlobalGenerator(cmGlobalGenerator *gg) this->GlobalGenerator = gg; // setup the home directories + this->Makefile->GetProperties().SetCMakeInstance(gg->GetCMakeInstance()); this->Makefile->SetHomeDirectory( gg->GetCMakeInstance()->GetHomeDirectory()); this->Makefile->SetHomeOutputDirectory( @@ -200,15 +201,15 @@ void cmLocalGenerator::GenerateTestFiles() fout << "\""; } fout << ")" << std::endl; - std::map<cmStdString,cmStdString>::const_iterator pit; - const std::map<cmStdString,cmStdString>* mpit = &test->GetProperties(); + cmPropertyMap::const_iterator pit; + cmPropertyMap* mpit = &test->GetProperties(); if ( mpit->size() ) { fout << "SET_TESTS_PROPERTIES(" << test->GetName() << " PROPERTIES "; for ( pit = mpit->begin(); pit != mpit->end(); ++ pit ) { fout << " " << pit->first.c_str() << " \""; - const char* value = pit->second.c_str(); + const char* value = pit->second.GetValue(); for ( ; *value; ++ value ) { switch ( *value ) |