Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 14:08:35 +08:00
Code Issues Projects Releases Wiki Activity

Source: Fix typo in _WIN32 preprocessor checks

Browse Source 
Since CMake's default compiler flags with MSVC include `-DWIN32` for
historical reasons, a few preprocessor conditions were accidentally
checking for `WIN32` instead of `_WIN32`.  The corresponding blocks
were left out when compiling official binaries for `cmake.org` because
we hard-code compiler flags without `-DWIN32`.

Fixes: #22764
This commit is contained in:
Brad King
2021-10-15 11:33:00 -04:00
parent c352d16aaf
commit 40e73c5ac4
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CPack/cmCPackDebGenerator.cxx
View File

@@ -211,7 +211,7 @@ bool DebGenerator::generateDataTar() const
cmCPackLogger(cmCPackLog::LOG_DEBUG, cmCPackLogger(cmCPackLog::LOG_DEBUG,
"RELATIVEDIR: \"" << relativeDir << "\"" << std::endl); "RELATIVEDIR: \"" << relativeDir << "\"" << std::endl);
#ifdef WIN32 #ifdef _WIN32
std::string mode_t_adt_filename = file + ":cmake_mode_t"; std::string mode_t_adt_filename = file + ":cmake_mode_t";
cmsys::ifstream permissionStream(mode_t_adt_filename.c_str()); cmsys::ifstream permissionStream(mode_t_adt_filename.c_str());

2
Source/cmFileCopier.cxx
View File

@@ -72,7 +72,7 @@ bool cmFileCopier::SetPermissions(const std::string& toFile,
mode_t permissions) mode_t permissions)
{ {
if (permissions) { if (permissions) {
#ifdef WIN32 #ifdef _WIN32
if (Makefile->IsOn("CMAKE_CROSSCOMPILING")) { if (Makefile->IsOn("CMAKE_CROSSCOMPILING")) {
// Store the mode in an NTFS alternate stream. // Store the mode in an NTFS alternate stream.
std::string mode_t_adt_filename = toFile + ":cmake_mode_t"; std::string mode_t_adt_filename = toFile + ":cmake_mode_t";

2
Source/cmLocalNinjaGenerator.cxx
View File

@@ -85,7 +85,7 @@ void cmLocalNinjaGenerator::Generate()
cmGlobalNinjaGenerator::WriteComment(this->GetRulesFileStream(), cmGlobalNinjaGenerator::WriteComment(this->GetRulesFileStream(),
"localized /showIncludes string"); "localized /showIncludes string");
this->GetRulesFileStream() << "msvc_deps_prefix = "; this->GetRulesFileStream() << "msvc_deps_prefix = ";
#ifdef WIN32 #ifdef _WIN32
// Ninja uses the ANSI Windows APIs, so strings in the rules file // Ninja uses the ANSI Windows APIs, so strings in the rules file
// typically need to be ANSI encoded. However, in this case the compiler // typically need to be ANSI encoded. However, in this case the compiler
// is being invoked using the UTF-8 codepage so the /showIncludes prefix // is being invoked using the UTF-8 codepage so the /showIncludes prefix

2
Source/cmcmd.cxx
View File

@@ -1334,7 +1334,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args,
cmSystemTools::Error("Problem extracting tar: " + outFile); cmSystemTools::Error("Problem extracting tar: " + outFile);
return 1; return 1;
} }
#ifdef WIN32 #ifdef _WIN32
// OK, on windows 7 after we untar some files, // OK, on windows 7 after we untar some files,
// sometimes we can not rename the directory after // sometimes we can not rename the directory after
// the untar is done. This breaks the external project // the untar is done. This breaks the external project