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

fix for cygwin and nmake that does not define WIN32

This commit is contained in:
Bill Hoffman 2002-09-24 09:24:39 -04:00
parent 305081002e
commit 94f1e8f5c5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmDynamicLoader.cxx
View File

@ -344,7 +344,11 @@ const char* cmDynamicLoader::LibPrefix()
const char* cmDynamicLoader::LibExtension() const char* cmDynamicLoader::LibExtension()
{ {
#ifdef __CYGWIN__
return ".dll";
#else
return ".so"; return ".so";
#endif
} }
const char* cmDynamicLoader::LastError() const char* cmDynamicLoader::LastError()

3
Source/cmGlobalGenerator.cxx
View File

@ -166,7 +166,7 @@ int cmGlobalGenerator::TryCompile(const char *, const char *bindir,
{ {
makeCommand += " "; makeCommand += " ";
makeCommand += target; makeCommand += target;
#ifdef WIN32 #if defined(_WIN32) || defined(__CYGWIN__)
makeCommand += ".exe"; makeCommand += ".exe";
#endif // WIN32 #endif // WIN32
} }
@ -175,7 +175,6 @@ int cmGlobalGenerator::TryCompile(const char *, const char *bindir,
makeCommand += " all"; makeCommand += " all";
} }
int retVal; int retVal;
if (!cmSystemTools::RunCommand(makeCommand.c_str(), *output, retVal, 0, false)) if (!cmSystemTools::RunCommand(makeCommand.c_str(), *output, retVal, 0, false))
{ {
cmSystemTools::Error("Generator: execution of make failed."); cmSystemTools::Error("Generator: execution of make failed.");