--- a/Resources/CMake/BoostConfiguration.cmake	Thu Feb 14 16:22:52 2019 +0100
+++ b/Resources/CMake/BoostConfiguration.cmake	Thu Feb 14 19:41:09 2019 +0100
@@ -246,6 +246,11 @@
 
     if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR
         CMAKE_SYSTEM_VERSION STREQUAL "LinuxStandardBase")
+      add_definitions(
+        -DBOOST_LOCALE_NO_WINAPI_BACKEND=1
+        -DBOOST_LOCALE_NO_POSIX_BACKEND=1
+        )
+      
       list(APPEND BOOST_SOURCES
         ${BOOST_SOURCES_DIR}/libs/locale/src/std/codecvt.cpp
         ${BOOST_SOURCES_DIR}/libs/locale/src/std/collate.cpp
@@ -254,12 +259,14 @@
         ${BOOST_SOURCES_DIR}/libs/locale/src/std/std_backend.cpp
         )
 
-      add_definitions(
-        -DBOOST_LOCALE_WITH_ICONV=1
-        -DBOOST_LOCALE_NO_WINAPI_BACKEND=1
-        -DBOOST_LOCALE_NO_POSIX_BACKEND=1
-        )
-      
+      if (BOOST_LOCALE_BACKEND STREQUAL "iconv")
+        add_definitions(-DBOOST_LOCALE_WITH_ICONV=1)
+      elseif (BOOST_LOCALE_BACKEND STREQUAL "icu")
+        add_definitions(-DBOOST_LOCALE_WITH_ICU=1)
+      else()
+        message(FATAL_ERROR "Unsupported value for BOOST_LOCALE_BACKEND: ${BOOST_LOCALE_BACKEND}")
+      endif()
+
     elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR
             CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR
             CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
@@ -268,6 +275,11 @@
             CMAKE_SYSTEM_NAME STREQUAL "NaCl32" OR
             CMAKE_SYSTEM_NAME STREQUAL "NaCl64" OR
             CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # For WebAssembly or asm.js
+      add_definitions(
+        -DBOOST_LOCALE_NO_WINAPI_BACKEND=1
+        -DBOOST_LOCALE_NO_STD_BACKEND=1
+        )
+      
       list(APPEND BOOST_SOURCES
         ${BOOST_SOURCES_DIR}/libs/locale/src/posix/codecvt.cpp
         ${BOOST_SOURCES_DIR}/libs/locale/src/posix/collate.cpp
@@ -276,13 +288,34 @@
         ${BOOST_SOURCES_DIR}/libs/locale/src/posix/posix_backend.cpp
         )
 
+      if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR
+          BOOST_LOCALE_BACKEND STREQUAL "iconv")
+        # In WebAssembly or asm.js, we rely on the version of iconv
+        # that is shipped with the stdlib
+        add_definitions(-DBOOST_LOCALE_WITH_ICONV=1)
+      elseif (BOOST_LOCALE_BACKEND STREQUAL "icu")
+        add_definitions(-DBOOST_LOCALE_WITH_ICU=1)
+        list(APPEND BOOST_SOURCES
+           ${BOOST_SOURCES_DIR}/libs/locale/src/icu/boundary.cpp
+           ${BOOST_SOURCES_DIR}/libs/locale/src/icu/codecvt.cpp
+           ${BOOST_SOURCES_DIR}/libs/locale/src/icu/collator.cpp
+           ${BOOST_SOURCES_DIR}/libs/locale/src/icu/conversion.cpp
+           ${BOOST_SOURCES_DIR}/libs/locale/src/icu/date_time.cpp
+           ${BOOST_SOURCES_DIR}/libs/locale/src/icu/formatter.cpp   
+           ${BOOST_SOURCES_DIR}/libs/locale/src/icu/icu_backend.cpp
+           ${BOOST_SOURCES_DIR}/libs/locale/src/icu/numeric.cpp
+           ${BOOST_SOURCES_DIR}/libs/locale/src/icu/time_zone.cpp
+          )        
+      else()
+        message(FATAL_ERROR "Unsupported value for BOOST_LOCALE_BACKEND: ${BOOST_LOCALE_BACKEND}")
+      endif()
+
+    elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
       add_definitions(
-        -DBOOST_LOCALE_WITH_ICONV=1
-        -DBOOST_LOCALE_NO_WINAPI_BACKEND=1
+        -DBOOST_LOCALE_NO_POSIX_BACKEND=1
         -DBOOST_LOCALE_NO_STD_BACKEND=1
         )
-      
-    elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+
       list(APPEND BOOST_SOURCES
         ${BOOST_SOURCES_DIR}/libs/locale/src/win32/collate.cpp
         ${BOOST_SOURCES_DIR}/libs/locale/src/win32/converter.cpp
@@ -291,19 +324,18 @@
         ${BOOST_SOURCES_DIR}/libs/locale/src/win32/win_backend.cpp
         )
 
-      add_definitions(
-        -DBOOST_LOCALE_NO_POSIX_BACKEND=1
-        -DBOOST_LOCALE_NO_STD_BACKEND=1
-        )
-
       # Starting with release 0.8.2, Orthanc statically links against
       # libiconv, even on Windows. Indeed, the "WCONV" library of
       # Windows XP seems not to support properly several codepages
       # (notably "Latin3", "Hebrew", and "Arabic"). Set
-      # "USE_BOOST_ICONV" to "OFF" to use WCONV anyway.
+      # "BOOST_LOCALE_BACKEND" to "wconv" to use WCONV anyway.
 
-      if (USE_BOOST_ICONV)
+      if (BOOST_LOCALE_BACKEND STREQUAL "iconv")
         add_definitions(-DBOOST_LOCALE_WITH_ICONV=1)
+      elseif (BOOST_LOCALE_BACKEND STREQUAL "icu")
+        add_definitions(-DBOOST_LOCALE_WITH_ICU=1)
+      elseif (BOOST_LOCALE_BACKEND STREQUAL "wconv")
+        message("Using Window's wconv")
       else()
         add_definitions(-DBOOST_LOCALE_WITH_WCONV=1)
       endif()