diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-15 16:14:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-10-15 16:14:38 (GMT) |
| commit | ad76bedabbfe856bf2f9594169fbdd8dd1866956 (patch) | |
| tree | 5c71105ef6c93b978bcdfbf1d63f3cafd5f32740 /Source | |
| parent | 6a8531a60a5ea7c78e710869a596124288729269 (diff) | |
| parent | 40e73c5ac4849fdbeb58850bf93de7f2c581f26e (diff) | |
| download | CMake-ad76bedabbfe856bf2f9594169fbdd8dd1866956.zip CMake-ad76bedabbfe856bf2f9594169fbdd8dd1866956.tar.gz CMake-ad76bedabbfe856bf2f9594169fbdd8dd1866956.tar.bz2 | |
Merge branch 'fix-ifdef-windows' into release-3.20
Merge-request: !6631
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmFileCopier.cxx | 2 | ||||
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmcmd.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index e7bcfac..b9439a5 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -232,7 +232,7 @@ bool DebGenerator::generateDataTar() const cmCPackLogger(cmCPackLog::LOG_DEBUG, "RELATIVEDIR: \"" << relativeDir << "\"" << std::endl); -#ifdef WIN32 +#ifdef _WIN32 std::string mode_t_adt_filename = file + ":cmake_mode_t"; cmsys::ifstream permissionStream(mode_t_adt_filename.c_str()); diff --git a/Source/cmFileCopier.cxx b/Source/cmFileCopier.cxx index 48fc286..237d234 100644 --- a/Source/cmFileCopier.cxx +++ b/Source/cmFileCopier.cxx @@ -72,7 +72,7 @@ bool cmFileCopier::SetPermissions(const std::string& toFile, mode_t permissions) { if (permissions) { -#ifdef WIN32 +#ifdef _WIN32 if (Makefile->IsOn("CMAKE_CROSSCOMPILING")) { // Store the mode in an NTFS alternate stream. std::string mode_t_adt_filename = toFile + ":cmake_mode_t"; diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 081cc41..7a5f062 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -88,7 +88,7 @@ void cmLocalNinjaGenerator::Generate() cmGlobalNinjaGenerator::WriteComment(this->GetRulesFileStream(), "localized /showIncludes string"); this->GetRulesFileStream() << "msvc_deps_prefix = "; -#ifdef WIN32 +#ifdef _WIN32 // Ninja uses the ANSI Windows APIs, so strings in the rules file // typically need to be ANSI encoded. However, in this case the compiler // is being invoked using the UTF-8 codepage so the /showIncludes prefix diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 6713cc3..6ca4388 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1457,7 +1457,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args, cmSystemTools::Error("Problem extracting tar: " + outFile); return 1; } -#ifdef WIN32 +#ifdef _WIN32 // OK, on windows 7 after we untar some files, // sometimes we can not rename the directory after // the untar is done. This breaks the external project |