Commit 94f1e8f5 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

fix for cygwin and nmake that does not define WIN32

parent 30508100
......@@ -344,7 +344,11 @@ const char* cmDynamicLoader::LibPrefix()
const char* cmDynamicLoader::LibExtension()
{
#ifdef __CYGWIN__
return ".dll";
#else
return ".so";
#endif
}
const char* cmDynamicLoader::LastError()
......
......@@ -166,7 +166,7 @@ int cmGlobalGenerator::TryCompile(const char *, const char *bindir,
{
makeCommand += " ";
makeCommand += target;
#ifdef WIN32
#if defined(_WIN32) || defined(__CYGWIN__)
makeCommand += ".exe";
#endif // WIN32
}
......@@ -175,7 +175,6 @@ int cmGlobalGenerator::TryCompile(const char *, const char *bindir,
makeCommand += " all";
}
int retVal;
if (!cmSystemTools::RunCommand(makeCommand.c_str(), *output, retVal, 0, false))
{
cmSystemTools::Error("Generator: execution of make failed.");
......
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