diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-05-24 13:39:59 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-05-24 20:05:46 +0100 |
| commit | 02638a0865271959e7a424622088eb502721e24c (patch) | |
| tree | 822c239736b2bf6c7827c53564960b7509827690 /external | |
| parent | f2a01771ea967c09ceeca47b6159bf993bd33773 (diff) | |
cppunit: always compile with debugging symbols on windows.
Also cleanup some makefile pieces and give better error warnings.
Change-Id: I9f20d60f26d5828f60664941946c266c7d166f32
Diffstat (limited to 'external')
| -rw-r--r-- | external/cppunit/ExternalProject_cppunit.mk | 8 | ||||
| -rw-r--r-- | external/cppunit/UnpackedTarball_cppunit.mk | 1 | ||||
| -rw-r--r-- | external/cppunit/enable-win32-debug.patch | 18 |
3 files changed, 22 insertions, 5 deletions
diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 9a163e7876f2..30a5905bcc00 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -13,15 +13,13 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\ build \ )) - ifeq ($(OS)$(COM),WNTMSC) $(call gb_ExternalProject_get_state_target,cppunit,build) : $(call gb_ExternalProject_run,build,\ - msbuild.exe cppunit_dll.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ - $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0) \ + PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0)" \ + && msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \ && cd ../DllPlugInTester \ - && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ - $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0) \ + && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \ ,src/cppunit) else diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk index a46e9bf6b3b2..fbae41b549a8 100644 --- a/external/cppunit/UnpackedTarball_cppunit.mk +++ b/external/cppunit/UnpackedTarball_cppunit.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ external/cppunit/unix.patch \ external/cppunit/wundef.patch \ external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 \ + external/cppunit/enable-win32-debug.patch \ )) ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ diff --git a/external/cppunit/enable-win32-debug.patch b/external/cppunit/enable-win32-debug.patch new file mode 100644 index 000000000000..661bb4b35f9c --- /dev/null +++ b/external/cppunit/enable-win32-debug.patch @@ -0,0 +1,18 @@ +--- misc/cppunit-1.13.1/src/cppunit/cppunit_dll.vcxproj ++++ misc/build/cppunit-1.13.1/src/cppunit/cppunit_dll.vcxproj +@@ -107,7 +107,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> +@@ -138,6 +137,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> |