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

ENH: fix for dll builds

This commit is contained in:
Bill Hoffman 2001-11-16 16:28:42 -05:00
parent 3e16ec5eda
commit 25ac768763
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/cmNMakeMakefileGenerator.cxx
View File

@ -264,15 +264,8 @@ OutputBuildObjectFromSource(std::ostream& fout,
} }
else if (ext == "def") else if (ext == "def")
{ {
// *** do something here?? // no rule to output for this one
} return;
else if (ext == "ico")
{
// do something here??
}
else if (ext == "rc2")
{
// do something here??
} }
// assume c++ if not c rc or def // assume c++ if not c rc or def
else else
@ -312,6 +305,16 @@ void cmNMakeMakefileGenerator::OutputSharedLibraryRule(std::ostream& fout,
linklibs << std::ends; linklibs << std::ends;
command += linklibs.str(); command += linklibs.str();
delete [] linklibs.str(); delete [] linklibs.str();
const std::vector<cmSourceFile>& sources = t.GetSourceFiles();
for(std::vector<cmSourceFile>::const_iterator i = sources.begin();
i != sources.end(); ++i)
{
if(i->GetSourceExtension() == "def")
{
command += "/DEF:";
command += i->GetFullPath();
}
}
command += "\n<<\n"; command += "\n<<\n";
m_QuoteNextCommand = false; m_QuoteNextCommand = false;
this->OutputMakeRule(fout, "rules for a shared library", this->OutputMakeRule(fout, "rules for a shared library",
@ -429,15 +432,20 @@ void cmNMakeMakefileGenerator::OutputLinkLibraries(std::ostream& fout,
} }
linkLibs += librariesLinked; linkLibs += librariesLinked;
fout << linkLibs << "$(CMAKE_STANDARD_WINDOWS_LIBRARIES) "; fout << linkLibs;
} }
fout << "$(CMAKE_STANDARD_WINDOWS_LIBRARIES) ";
} }
std::string cmNMakeMakefileGenerator::GetOutputExtension(const char* s) std::string cmNMakeMakefileGenerator::GetOutputExtension(const char* s)
{ {
std::string sourceExtension = s; std::string sourceExtension = s;
if(sourceExtension == "def" || sourceExtension == "ico" || sourceExtension == "rc2") if(sourceExtension == "def")
{
return "";
}
if(sourceExtension == "ico" || sourceExtension == "rc2")
{ {
return ""; return "";
} }