summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2001-02-16 16:34:23 (GMT)
committerKen Martin <ken.martin@kitware.com>2001-02-16 16:34:23 (GMT)
commit43859e36cfa3dede4f935ada5ad08ee6e7eb1d76 (patch)
tree622fb609e84cbefa6e34bd2a60bc084ab15b5ab7 /Source/cmMakefile.cxx
parentfce56c57c497ede3a7afcbc7965846cc8bad9db2 (diff)
downloadCMake-43859e36cfa3dede4f935ada5ad08ee6e7eb1d76.zip
CMake-43859e36cfa3dede4f935ada5ad08ee6e7eb1d76.tar.gz
CMake-43859e36cfa3dede4f935ada5ad08ee6e7eb1d76.tar.bz2
ENH: add new commands fro find library and find program
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx16
1 files changed, 11 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index e16ea75..ee29a6d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -226,7 +226,7 @@ void cmMakefile::SetMakefileGenerator(cmMakefileGenerator* mf)
void cmMakefile::GenerateMakefile()
{
// do all the variable expansions here
- this->ExpandVaribles();
+ this->ExpandVariables();
// set the makefile on the generator
m_MakefileGenerator->SetMakefile(this);
// give all the commands a chance to do something
@@ -373,7 +373,7 @@ std::string cmMakefile::GetParentListFileName(const char *currentFileName)
// expance CMAKE_BINARY_DIR and CMAKE_SOURCE_DIR in the
// include and library directories.
-void cmMakefile::ExpandVaribles()
+void cmMakefile::ExpandVariables()
{
// make sure binary and source dir are defined
this->AddDefinition("CMAKE_BINARY_DIR", this->GetHomeOutputDirectory());
@@ -385,13 +385,19 @@ void cmMakefile::ExpandVaribles()
end = m_IncludeDirectories.end();
for(j = begin; j != end; ++j)
{
- this->ExpandVariblesInString(*j);
+ this->ExpandVariablesInString(*j);
}
begin = m_LinkDirectories.begin();
end = m_LinkDirectories.end();
for(j = begin; j != end; ++j)
{
- this->ExpandVariblesInString(*j);
+ this->ExpandVariablesInString(*j);
+ }
+ begin = m_LinkLibraries.begin();
+ end = m_LinkLibraries.end();
+ for(j = begin; j != end; ++j)
+ {
+ this->ExpandVariablesInString(*j);
}
}
@@ -436,7 +442,7 @@ int cmMakefile::DumpDocumentationToFile(const char *fileName)
}
-void cmMakefile::ExpandVariblesInString(std::string& source)
+void cmMakefile::ExpandVariablesInString(std::string& source)
{
for(DefinitionMap::iterator i = m_Definitions.begin();
i != m_Definitions.end(); ++i)