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

BUG: handle .exe extension for cygwin

Browse Source
This commit is contained in:
Bill Hoffman 2002-08-08 12:30:39 -04:00
parent f7bddda0b7
commit f23688659f
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmUnixMakefileGenerator.cxx
View File

@ -26,7 +26,7 @@
cmUnixMakefileGenerator::cmUnixMakefileGenerator() cmUnixMakefileGenerator::cmUnixMakefileGenerator()
:m_SharedLibraryExtension("$(SHLIB_SUFFIX)"), :m_SharedLibraryExtension("$(SHLIB_SUFFIX)"),
m_ObjectFileExtension(".o"), m_ObjectFileExtension(".o"),
m_ExecutableExtension(""), m_ExecutableExtension(cmSystemTools::GetExecutableExtension()),
m_StaticLibraryExtension(".a"), m_StaticLibraryExtension(".a"),
m_LibraryPrefix("lib") m_LibraryPrefix("lib")
{ {
@ -758,7 +758,7 @@ void cmUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
const char* name, const char* name,
const cmTarget &t) const cmTarget &t)
{ {
std::string target = m_ExecutableOutputPath + name; std::string target = m_ExecutableOutputPath + name + m_ExecutableExtension;
std::string depend = "$("; std::string depend = "$(";
depend += this->CreateMakeVariable(name, "_SRC_OBJS") depend += this->CreateMakeVariable(name, "_SRC_OBJS")
+ ") $(" + this->CreateMakeVariable(name, "_DEPEND_LIBS") + ")"; + ") $(" + this->CreateMakeVariable(name, "_DEPEND_LIBS") + ")";
@ -1134,16 +1134,7 @@ void cmUnixMakefileGenerator::OutputExeDepend(std::ostream& fout,
// add the library name // add the library name
exepath += name; exepath += name;
// add the correct extension // add the correct extension
if (m_Makefile->GetDefinition("CMAKE_EXECUTABLE_SUFFIX")) exepath += m_ExecutableExtension;
{
std::string replaceVars =
m_Makefile->GetDefinition("CMAKE_EXECUTABLE_SUFFIX");
if (!strcmp(replaceVars.c_str(),"@CMAKE_EXECUTABLE_SUFFIX@"))
{
replaceVars = "";
}
exepath += replaceVars;
}
fout << this->ConvertToOutputPath(exepath.c_str()) << " "; fout << this->ConvertToOutputPath(exepath.c_str()) << " ";
} }
} }
@ -1811,7 +1802,7 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
"remove generated files", "remove generated files",
"clean", "clean",
"$(SUBDIR_CLEAN)", "$(SUBDIR_CLEAN)",
"-@ $(RM) $(CLEAN_OBJECT_FILES) $(EXECUTABLES)" "-@ $(RM) $(CLEAN_OBJECT_FILES) "
" $(TARGETS) $(GENERATED_QT_FILES) $(GENERATED_FLTK_FILES)"); " $(TARGETS) $(GENERATED_QT_FILES) $(GENERATED_FLTK_FILES)");
// collect up all the sources // collect up all the sources