[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-471-g833e052

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  833e0523e54a9ade85f4f5aae5c331e2b5facd88 (commit)
       via  83af11d4112443ed732cd240eb0bfdfd27048825 (commit)
      from  9a1806a4d0a4c12ddabad06f16719dd34893d2f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=833e0523e54a9ade85f4f5aae5c331e2b5facd88
commit 833e0523e54a9ade85f4f5aae5c331e2b5facd88
Merge: 9a1806a 83af11d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 15 10:07:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 15 10:07:03 2015 -0400

    Merge topic 'fix-windows-preprocessor-checks' into next
    
    83af11d4 Fix preprocessor checks WIN32 => _WIN32


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83af11d4112443ed732cd240eb0bfdfd27048825
commit 83af11d4112443ed732cd240eb0bfdfd27048825
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 15 09:56:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 15 09:58:29 2015 -0400

    Fix preprocessor checks WIN32 => _WIN32
    
    The latter is predefined by Windows toolchains and is more reliable.
    
    Reported-by: Michael Stürmer <michael.stuermer at schaeffler.com>

diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx
index e021d0b..41785c2 100644
--- a/Source/cmExecProgramCommand.cxx
+++ b/Source/cmExecProgramCommand.cxx
@@ -156,7 +156,7 @@ bool cmExecProgramCommand::RunCommand(const char* command,
     verbose = false;
     }
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
   // if the command does not start with a quote, then
   // try to find the program, and if the program can not be
   // found use system to run the command as it must be a built in
@@ -219,7 +219,7 @@ bool cmExecProgramCommand::RunCommand(const char* command,
     return false;
     }
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
   if(dir)
     {
     cmsysProcess_SetWorkingDirectory(cp, dir);
@@ -305,7 +305,7 @@ bool cmExecProgramCommand::RunCommand(const char* command,
     }
   if(!msg.empty())
     {
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
     // Old Windows process execution printed this info.
     msg += "\n\nfor command: ";
     msg += command;
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 7440357..f740020 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -66,7 +66,7 @@ static mode_t mode_setuid = S_ISUID;
 static mode_t mode_setgid = S_ISGID;
 #endif
 
-#if defined(WIN32) && defined(CMAKE_ENCODING_UTF8)
+#if defined(_WIN32) && defined(CMAKE_ENCODING_UTF8)
 // libcurl doesn't support file:// urls for unicode filenames on Windows.
 // Convert string from UTF-8 to ACP if this is a file:// URL.
 static std::string fix_file_url_windows(const std::string& url)
@@ -3156,7 +3156,7 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args)
     return false;
     }
 
-#if defined(WIN32) && defined(CMAKE_ENCODING_UTF8)
+#if defined(_WIN32) && defined(CMAKE_ENCODING_UTF8)
   url = fix_file_url_windows(url);
 #endif
 
@@ -3411,7 +3411,7 @@ cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args)
 
   unsigned long file_size = cmsys::SystemTools::FileLength(filename);
 
-#if defined(WIN32) && defined(CMAKE_ENCODING_UTF8)
+#if defined(_WIN32) && defined(CMAKE_ENCODING_UTF8)
   url = fix_file_url_windows(url);
 #endif
 
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index ef32c75..f472ed8 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -609,7 +609,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget const* target)
 
   // Ensure we have write permission in case .in was read-only.
   mode_t perm = 0;
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
   mode_t mode_write = S_IWRITE;
 #else
   mode_t mode_write = S_IWUSR;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExecProgramCommand.cxx |    6 +++---
 Source/cmFileCommand.cxx        |    6 +++---
 Source/cmQtAutoGenerators.cxx   |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake