diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-17 13:49:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-17 13:49:54 (GMT) |
| commit | 5a21cbc96bb5905638cca978f5996c60b7f940fa (patch) | |
| tree | 3414f121b60210056d01047a0f25ef286fbb7400 /Source/QtDialog | |
| parent | 223b05a80c3a1b237edea8d7a404fead5f6c6c61 (diff) | |
| parent | ee8cef8725486519a7ab47eb16208d4d64e0ab99 (diff) | |
| download | CMake-5a21cbc96bb5905638cca978f5996c60b7f940fa.zip CMake-5a21cbc96bb5905638cca978f5996c60b7f940fa.tar.gz CMake-5a21cbc96bb5905638cca978f5996c60b7f940fa.tar.bz2 | |
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.
Diffstat (limited to 'Source/QtDialog')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Source/QtDialog/CMakeSetup.cxx | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 4e0bb50..07a50b9 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -59,11 +59,6 @@ else() endif() endif() - -if(WIN32 AND KWSYS_ENCODING_DEFAULT_CODEPAGE MATCHES CP_UTF8) - add_definitions(-DKWSYS_CP_UTF8) -endif() - set(SRCS AddCacheEntry.cxx AddCacheEntry.h diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 1b04a00..82fa3a3 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -79,7 +79,7 @@ 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::setCodecForLocale(utf8_codec); #endif |