Mercurial > hg > orthanc
changeset 1060:303eb5e09a4b
pch
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 14:29:55 +0200 |
| parents | f25c79497739 |
| children | 4b4ab35c04f5 |
| files | NEWS Resources/CMake/Compiler.cmake |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Fri Jul 25 14:08:10 2014 +0200 +++ b/NEWS Fri Jul 25 14:29:55 2014 +0200 @@ -9,6 +9,7 @@ * On-the-fly conversion of JSON to XML according to the HTTP Accept header * C-Echo SCU in the REST API * Lua scripts can do HTTP requests, and thus can call Web services +* Fix build of Google Log with Visual Studio >= 11.0 Plugins -------
--- a/Resources/CMake/Compiler.cmake Fri Jul 25 14:08:10 2014 +0200 +++ b/Resources/CMake/Compiler.cmake Fri Jul 25 14:29:55 2014 +0200 @@ -28,6 +28,9 @@ string(REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var}}") endforeach(flag_var) + # 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 -D_CRT_SECURE_NO_DEPRECATE=1