Commit 63cb6c74 authored by Sebastien Barre's avatar Sebastien Barre
Browse files

Expand vars in exe and lib name

parent 10ae8a4e
......@@ -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;
......
......@@ -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;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment