diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-09-24 13:24:39 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-09-24 13:24:39 (GMT) |
| commit | 94f1e8f5c59564e7a8986fbe20a2d7661237883b (patch) | |
| tree | eb4433f97407e226c4267acbc81ec3655ce7e2c8 | |
| parent | 305081002eafab32d071ce10d723727d1d81d6e1 (diff) | |
| download | CMake-94f1e8f5c59564e7a8986fbe20a2d7661237883b.zip CMake-94f1e8f5c59564e7a8986fbe20a2d7661237883b.tar.gz CMake-94f1e8f5c59564e7a8986fbe20a2d7661237883b.tar.bz2 | |
fix for cygwin and nmake that does not define WIN32
| -rw-r--r-- | Source/cmDynamicLoader.cxx | 4 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmDynamicLoader.cxx b/Source/cmDynamicLoader.cxx index 6c6dfc9..c997e38 100644 --- a/Source/cmDynamicLoader.cxx +++ b/Source/cmDynamicLoader.cxx @@ -344,7 +344,11 @@ const char* cmDynamicLoader::LibPrefix() const char* cmDynamicLoader::LibExtension() { +#ifdef __CYGWIN__ + return ".dll"; +#else return ".so"; +#endif } const char* cmDynamicLoader::LastError() diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 437ab70..45c03c7 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -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."); |