[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-908-g5020481

[Stephen Kelly]

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  50204817f8062b17f4d913491dcdd7686d005aa2 (commit)
       via  888a35f6eb3fb217e21f2933ef2013cf2d6f9d25 (commit)
      from  18753092b04f8a02795b3f916ffd10093907cd7e (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=50204817f8062b17f4d913491dcdd7686d005aa2
commit 50204817f8062b17f4d913491dcdd7686d005aa2
Merge: 1875309 888a35f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 12 12:46:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 12 12:46:44 2014 -0400

    Merge topic 'fix-Qt5-windows-build' into next
    
    888a35f6 Revert "QtDialog: Don't define KWSYS_CP_UTF8 if using Qt 5."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=888a35f6eb3fb217e21f2933ef2013cf2d6f9d25
commit 888a35f6eb3fb217e21f2933ef2013cf2d6f9d25
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 12 17:46:11 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 12 17:46:11 2014 +0100

    Revert "QtDialog: Don't define KWSYS_CP_UTF8 if using Qt 5."
    
    This reverts commit 5263e765f6650b36aeeec4bcbfc102471065d728.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index cbb8830..5cddeb2 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -56,10 +56,11 @@ else()
       set(Qt_BIN_DIR ${_Qt_BIN_DIR})
     endif()
   endif()
+endif()
 
-  if(WIN32 AND KWSYS_ENCODING_DEFAULT_CODEPAGE MATCHES CP_UTF8)
-    add_definitions(-DKWSYS_CP_UTF8)
-  endif()
+
+if(WIN32 AND KWSYS_ENCODING_DEFAULT_CODEPAGE MATCHES CP_UTF8)
+  add_definitions(-DKWSYS_CP_UTF8)
 endif()
 
 set(SRCS

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

Summary of changes:
 Source/QtDialog/CMakeLists.txt |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake