kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: make sure exe output path is used for dep hack stuff

This commit is contained in:
Bill Hoffman 2003-08-28 16:22:46 -04:00
parent 5824302612
commit dd4e8df29a
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -466,10 +466,22 @@ void cmLocalVisualStudio6Generator::WriteCustomRule(std::ostream& fout,
std::string libPath = dep + "_CMAKE_PATH"; std::string libPath = dep + "_CMAKE_PATH";
const char* cacheValue = m_Makefile->GetDefinition(libPath.c_str()); const char* cacheValue = m_Makefile->GetDefinition(libPath.c_str());
if (cacheValue) if (cacheValue)
{
std::string exePath = "";
if (m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"))
{
exePath = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
}
if(exePath.size())
{
libPath = exePath;
}
else
{ {
libPath = cacheValue; libPath = cacheValue;
}
libPath += "/"; libPath += "/";
libPath += "$(INTDIR)"; libPath += "$(INTDIR)/";
libPath += dep; libPath += dep;
libPath += ".exe"; libPath += ".exe";
fout << "\\\n\t" << fout << "\\\n\t" <<

12
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -870,8 +870,20 @@ WriteCustomRule(std::ostream& fout,
std::string libPath = dep + "_CMAKE_PATH"; std::string libPath = dep + "_CMAKE_PATH";
const char* cacheValue = m_Makefile->GetDefinition(libPath.c_str()); const char* cacheValue = m_Makefile->GetDefinition(libPath.c_str());
if (cacheValue) if (cacheValue)
{
std::string exePath = "";
if (m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"))
{
exePath = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
}
if(exePath.size())
{
libPath = exePath;
}
else
{ {
libPath = cacheValue; libPath = cacheValue;
}
libPath += "/"; libPath += "/";
libPath += "$(INTDIR)"; libPath += "$(INTDIR)";
libPath += dep; libPath += dep;