diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-08-15 13:47:31 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-08-21 15:00:43 +0200 |
| commit | baffd4f1323979813ed43b46d28fa97861d6e015 (patch) | |
| tree | 55acebe593fbcaaa880568a875ed0b9e34a69b71 /external | |
| parent | fc69b5a73d0523a9313b2d9f5f0add866ecfcba9 (diff) | |
Don't break on twain_dsm warnings
(the warnings have appeared since MSVC 2017 update 8)
Change-Id: I5e180ebef0a9d6809f0b5ca3014f60eaedd8ffe9
Reviewed-on: https://gerrit.libreoffice.org/59070
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit c144dcbdb54cf657e21b0ba09ca8675246441519)
Reviewed-on: https://gerrit.libreoffice.org/59177
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch b/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch index 86b87a4ff41b..40e131d2ad71 100644 --- a/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch +++ b/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch @@ -3,7 +3,7 @@ new file mode 100755 index 000000000000..425c39966171 --- /dev/null +++ b/visual_studio/TWAIN_DSM_VS2015.vcxproj -@@ -0,0 +1,256 @@ +@@ -0,0 +1,258 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> @@ -122,7 +122,7 @@ index 000000000000..425c39966171 + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> -+ <TreatWarningAsError>true</TreatWarningAsError> ++ <TreatWarningAsError>false</TreatWarningAsError> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> @@ -158,7 +158,7 @@ index 000000000000..425c39966171 + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> -+ <TreatWarningAsError>true</TreatWarningAsError> ++ <TreatWarningAsError>false</TreatWarningAsError> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <ResourceCompile> @@ -191,6 +191,7 @@ index 000000000000..425c39966171 + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> ++ <TreatWarningAsError>false</TreatWarningAsError> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> @@ -223,6 +224,7 @@ index 000000000000..425c39966171 + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> ++ <TreatWarningAsError>false</TreatWarningAsError> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <ResourceCompile> |