diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-06 18:35:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-06 18:35:21 (GMT) |
| commit | 0f870234febd9dba0df78e903b412ea19d681062 (patch) | |
| tree | 05f5d59ee7ddb4e991c50fbe9a6b8ef3484d92fc /Source/cmSystemTools.cxx | |
| parent | 78c4418fa0a08b63a944ac66821e8bd95fdd73e0 (diff) | |
| parent | cd408d93fdf347ff63a8062f75f1f4ee3e898b17 (diff) | |
| download | CMake-0f870234febd9dba0df78e903b412ea19d681062.zip CMake-0f870234febd9dba0df78e903b412ea19d681062.tar.gz CMake-0f870234febd9dba0df78e903b412ea19d681062.tar.bz2 | |
Merge branch 'backport-no-global-setlocale' into no-global-setlocale
Resolve conflict in Source/CMakeLists.txt by taking both changes.
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index e9735ed..6a7467f 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -26,6 +26,7 @@ #include <cmsys/Encoding.hxx> #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmArchiveWrite.h" +# include "cmLocale.h" # include <cm_libarchive.h> # include <cmsys/Terminal.h> #endif @@ -1690,6 +1691,8 @@ long copy_data(struct archive *ar, struct archive *aw) bool extract_tar(const char* outFileName, bool verbose, bool extract) { + cmLocaleRAII localeRAII; + static_cast<void>(localeRAII); struct archive* a = archive_read_new(); struct archive *ext = archive_write_disk_new(); archive_read_support_compression_all(a); |