Mercurial > hg > orthanc

diff Resources/CMake/OrthancFrameworkConfiguration.cmake @ 2513:97a74f0eac7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
loading DICOM dictionaries in sandboxed environments
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 28 Mar 2018 18:02:07 +0200
parents 4dcafa8d6633
children 38d666a40860
line wrap: on
line diff
--- a/Resources/CMake/OrthancFrameworkConfiguration.cmake	Wed Mar 28 15:20:50 2018 +0200
+++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake	Wed Mar 28 18:02:07 2018 +0200
@@ -339,7 +339,14 @@
 ##
 
 if (ENABLE_LOCALE)
-  include(${CMAKE_CURRENT_LIST_DIR}/LibIconvConfiguration.cmake)
+  if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    # In WebAssembly or asm.js, we rely on the version of iconv that
+    # is shipped with the stdlib
+    unset(USE_BOOST_ICONV CACHE)
+  else()
+    include(${CMAKE_CURRENT_LIST_DIR}/LibIconvConfiguration.cmake)
+  endif()
+  
   add_definitions(-DORTHANC_ENABLE_LOCALE=1)
 endif()