summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-06-28 14:46:19 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-06-29 13:33:30 +0200
commit7373a1745a5cb36640de418ce908e748c5c695ef (patch)
tree094cbf2eb9d1120330a470c4f9ca016e4169efef
parent79110f761af53fabde45ef4174c5266c71e9d13d (diff)
cppunit: also build 64-bit DLL always with PDB file
Note: this maps to /Z7 apparently: <DebugInformationFormat>OldStyle</DebugInformationFormat> https://msdn.microsoft.com/en-us/library/bb629394.aspx lists various options but passing /p:DebugSymbols=true /p:DebugType=full /p:PdbFile=... to msbuild.exe by itself doesn't do anything while patching the project file works. Change-Id: I888b5f6af7be519e2d35b749873ae7d35bb0bf9d Reviewed-on: https://gerrit.libreoffice.org/56605 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit e35a8b248591884471dcffcc762a937116ae282c) Reviewed-on: https://gerrit.libreoffice.org/56671
-rw-r--r--external/cppunit/enable-win32-debug.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/external/cppunit/enable-win32-debug.patch b/external/cppunit/enable-win32-debug.patch
index ea50ba529356..dc159ecc51ad 100644
--- a/external/cppunit/enable-win32-debug.patch
+++ b/external/cppunit/enable-win32-debug.patch
@@ -16,3 +16,19 @@
<SubSystem>Console</SubSystem>
<OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile>
<ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary>
+@@ -237,7 +237,6 @@
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+- <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation>
+@@ -266,6 +266,7 @@
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
++ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile>
+ <ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary>