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, master has been updated
via 5a21cbc96bb5905638cca978f5996c60b7f940fa (commit)
via ee8cef8725486519a7ab47eb16208d4d64e0ab99 (commit)
via 91fd99b86532dbf35d8c7396654b9beac058c8f3 (commit)
from 223b05a80c3a1b237edea8d7a404fead5f6c6c61 (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=5a21cbc96bb5905638cca978f5996c60b7f940fa
commit 5a21cbc96bb5905638cca978f5996c60b7f940fa
Merge: 223b05a ee8cef8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Mar 17 09:49:54 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Mar 17 09:49:54 2014 -0400
Merge topic 'unicode-vs-projects'
ee8cef87 Encoding: If configured, write Visual Studio project files as
UTF-8.
91fd99b8 Encoding: Provide option to configure CMake to use UTF-8 encoding.
diff --cc Source/QtDialog/CMakeSetup.cxx
index 1b04a00,e37bd9d..82fa3a3
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@@ -79,9 -79,11 +79,9 @@@ int main(int argc, char** argv
QApplication app(argc, argv);
- #if defined(KWSYS_CP_UTF8)
+ #if defined(CMAKE_ENCODING_UTF8)
QTextCodec* utf8_codec = QTextCodec::codecForName("UTF-8");
- QTextCodec::setCodecForCStrings(utf8_codec);
QTextCodec::setCodecForLocale(utf8_codec);
- QTextCodec::setCodecForTr(utf8_codec);
#endif
// clean out standard Qt paths for plugins, which we don't use anyway
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 7 +++++++
Source/CMakeLists.txt | 5 +++++
Source/QtDialog/CMakeLists.txt | 5 -----
Source/QtDialog/CMakeSetup.cxx | 2 +-
Source/cmConfigure.cmake.h.in | 1 +
Source/cmGlobalVisualStudio7Generator.cxx | 14 +++++++++++++-
Source/cmGlobalVisualStudio7Generator.h | 3 +++
Source/cmGlobalVisualStudioGenerator.cxx | 3 ++-
Source/cmLocalVisualStudio7Generator.cxx | 12 ++++++++----
Source/cmVisualStudio10TargetGenerator.cxx | 6 ++++--
10 files changed, 44 insertions(+), 14 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
