diff options
| -rw-r--r-- | Source/cmAddExecutableCommand.cxx | 8 | ||||
| -rw-r--r-- | Source/cmAddLibraryCommand.cxx | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx index b1ce21f..504e53c 100644 --- a/Source/cmAddExecutableCommand.cxx +++ b/Source/cmAddExecutableCommand.cxx @@ -51,17 +51,21 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args) } std::vector<std::string>::const_iterator s = args.begin(); + + std::string exename = *s; + m_Makefile->ExpandVariablesInString(exename); + ++s; if (*s == "WIN32") { ++s; std::vector<std::string> srclists(s, args.end()); - m_Makefile->AddExecutable(args[0].c_str(),srclists, true); + m_Makefile->AddExecutable(exename.c_str(),srclists, true); } else { std::vector<std::string> srclists(s, args.end()); - m_Makefile->AddExecutable(args[0].c_str(),srclists, false); + m_Makefile->AddExecutable(exename.c_str(),srclists, false); } return true; diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx index cf3d68e..879d7b5 100644 --- a/Source/cmAddLibraryCommand.cxx +++ b/Source/cmAddLibraryCommand.cxx @@ -49,12 +49,16 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args) this->SetError("called with incorrect number of arguments"); return false; } - + // Library type defaults to value of BUILD_SHARED_LIBS, if it exists, // otherwise it defaults to static library. int shared = !cmSystemTools::IsOff(m_Makefile->GetDefinition("BUILD_SHARED_LIBS")); std::vector<std::string>::const_iterator s = args.begin(); + + std::string libname = *s; + m_Makefile->ExpandVariablesInString(libname); + ++s; // If the second argument is "SHARED" or "STATIC", then it controls @@ -81,8 +85,8 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args) } } std::vector<std::string> srclists(s, args.end()); - - m_Makefile->AddLibrary(args[0].c_str(), shared, srclists); + + m_Makefile->AddLibrary(libname.c_str(), shared, srclists); return true; } |