diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-06 18:38:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-06 18:38:41 (GMT) |
| commit | 8772420e2ff1da38903162ce8e9335edbe1c3dcd (patch) | |
| tree | fce0ab4193a73e3bb807a36fc3511f2da3b1442a /Source/cmSystemTools.cxx | |
| parent | cb01f1517051b577d571e8fd21d210ef303f56c9 (diff) | |
| parent | 0f870234febd9dba0df78e903b412ea19d681062 (diff) | |
| download | CMake-8772420e2ff1da38903162ce8e9335edbe1c3dcd.zip CMake-8772420e2ff1da38903162ce8e9335edbe1c3dcd.tar.gz CMake-8772420e2ff1da38903162ce8e9335edbe1c3dcd.tar.bz2 | |
Merge branch 'no-global-setlocale' into release
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); |