Mercurial > hg > orthanc-webviewer

changeset 168:38aa615b7667

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 22 Aug 2017 21:54:36 +0200
parents bd5597966b3d
children eb9fdf8db9f0
files CMakeLists.txt Orthanc/Core/Toolbox.cpp Orthanc/Core/Toolbox.h
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Aug 22 21:46:50 2017 +0200
+++ b/CMakeLists.txt	Tue Aug 22 21:54:36 2017 +0200
@@ -42,6 +42,7 @@
 
 set(ORTHANC_ROOT ${CMAKE_SOURCE_DIR}/Orthanc)
 set(ORTHANC_DISABLE_PATCH ON)  # No need for the "patch" command-line tool
+set(ENABLE_LOCALE OFF)         # Disable support for locales (notably in Boost)
 include(CheckIncludeFiles)
 include(CheckIncludeFileCXX)
 include(CheckLibraryExists)
@@ -91,6 +92,7 @@
   )
 
 add_definitions(
+  -DORTHANC_ENABLE_LOCALE=0
   -DORTHANC_ENABLE_PUGIXML=0
   -DORTHANC_SQLITE_STANDALONE=1
   )
--- a/Orthanc/Core/Toolbox.cpp	Tue Aug 22 21:46:50 2017 +0200
+++ b/Orthanc/Core/Toolbox.cpp	Tue Aug 22 21:54:36 2017 +0200
@@ -1326,7 +1326,6 @@
   {
     globalLocale_.reset();
   }
-#endif
 
   
   std::string Toolbox::ToUpperCaseWithAccents(const std::string& source)
@@ -1368,4 +1367,5 @@
     w = boost::algorithm::to_upper_copy<std::wstring>(w, *globalLocale_);
     return boost::locale::conv::utf_to_utf<char>(w);
   }
+#endif
 }
--- a/Orthanc/Core/Toolbox.h	Tue Aug 22 21:46:50 2017 +0200
+++ b/Orthanc/Core/Toolbox.h	Tue Aug 22 21:54:36 2017 +0200
@@ -209,8 +209,8 @@
     void InitializeGlobalLocale(const char* locale);
 
     void FinalizeGlobalLocale();
-#endif
 
     std::string ToUpperCaseWithAccents(const std::string& source);
+#endif
   }
 }