mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'msys-system-name'

Browse Source 
607051f266 MSYS,CYGWIN: Hard-code host system names when built for these runtimes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Peter Kokot <peterkokot@gmail.com>
Merge-request: !9213
This commit is contained in:
Brad King
2024-02-02 15:28:46 +00:00
committed by Kitware Robot
parent 8d01a388f1 607051f266
commit b8ee9db223
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmSystemTools.cxx
View File

@@ -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 "";