summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/cmSystemTools.cxx13
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 18ca85b..3b70543 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -3697,6 +3697,10 @@ cm::string_view cmSystemTools::GetSystemName()
{
#if defined(_WIN32)
return "Windows";
+#elif defined(__MSYS__)
+ return "MSYS";
+#elif defined(__CYGWIN__)
+ return "CYGWIN";
#elif defined(__ANDROID__)
return "Android";
#else
@@ -3725,15 +3729,6 @@ cm::string_view cmSystemTools::GetSystemName()
if (systemName.find("kFreeBSD") != cm::string_view::npos) {
systemName = "kFreeBSD";
}
-
- // fix for CYGWIN and MSYS which have windows version in them
- if (systemName.find("CYGWIN") != cm::string_view::npos) {
- systemName = "CYGWIN";
- }
-
- if (systemName.find("MSYS") != cm::string_view::npos) {
- systemName = "MSYS";
- }
return systemName;
}
return "";