Mercurial > hg > orthanc
diff Resources/CMake/Compiler.cmake @ 3251:fcfd4f73228c
using masm if compiling icu with Visual Studio
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sat, 16 Feb 2019 14:28:53 +0100 |
| parents | 212abfffc44d |
| children | ce6a98f8ed85 |
line wrap: on
line diff
--- a/Resources/CMake/Compiler.cmake Sat Feb 16 11:38:54 2019 +0100 +++ b/Resources/CMake/Compiler.cmake Sat Feb 16 14:28:53 2019 +0100 @@ -36,14 +36,8 @@ string(REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var}}") endforeach(flag_var) - if (BOOST_LOCALE_BACKEND STREQUAL "icu") - # If compiling icu, the heap space must be further increased: - # "icudt58l_dat.c(1638339): fatal error C1060: compiler is out of heap space" - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm1024") - else() - # Add /Zm256 compiler option to Visual Studio to fix PCH errors - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm256") - endif() + # Add /Zm256 compiler option to Visual Studio to fix PCH errors + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm256") add_definitions( -D_CRT_SECURE_NO_WARNINGS=1