[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1042-g4754b5c

[Clinton Stimpson]

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  4754b5c1d4c9d3f978297466d01187ed50a2e684 (commit)
       via  4402551e623047323ca2c6901db6557de58e055f (commit)
      from  56d6bd9e0d251f6c268f41647771e457bbc2729c (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=4754b5c1d4c9d3f978297466d01187ed50a2e684
commit 4754b5c1d4c9d3f978297466d01187ed50a2e684
Merge: 56d6bd9 4402551
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Mar 14 09:59:01 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 14 09:59:01 2014 -0400

    Merge topic 'unicode-vs-projects' into next
    
    4402551e Encoding: Provide option to configure CMake to use UTF-8 encoding.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4402551e623047323ca2c6901db6557de58e055f
commit 4402551e623047323ca2c6901db6557de58e055f
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Mar 14 07:54:21 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Mar 14 07:56:12 2014 -0600

    Encoding: Provide option to configure CMake to use UTF-8 encoding.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f83015..b0793d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,13 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
   endmacro()
 endif()
 
+# option to set the internal encoding of CMake to UTF-8
+option(CMAKE_ENCODING_UTF8 "Use UTF-8 encoding internally (experimental)." OFF)
+mark_as_advanced(CMAKE_ENCODING_UTF8)
+if(CMAKE_ENCODING_UTF8)
+  set(KWSYS_ENCODING_DEFAULT_CODEPAGE CP_UTF8)
+endif()
+
 #-----------------------------------------------------------------------
 # a macro to deal with system libraries, implemented as a macro
 # simply to improve readability of the main script
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 106cffc..9fb8d9a 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -24,12 +24,6 @@ endif()
 
 set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
 
-# for windows, we can use the utf-8 code page for conversions
-# between wide and narrow strings
-if(WIN32 AND KWSYS_ENCODING_DEFAULT_CODEPAGE MATCHES CP_UTF8)
-  set(CMAKE_ENCODING_UTF8 1)
-endif()
-
 # ensure Unicode friendly APIs are used on Windows
 if(WIN32)
   add_definitions(-DUNICODE -D_UNICODE)

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

Summary of changes:
 CMakeLists.txt        |    7 +++++++
 Source/CMakeLists.txt |    6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake