mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cppunit: always compile with debugging symbols on windows.

Browse Source 
Also cleanup some makefile pieces and give better error warnings.

Change-Id: I9f20d60f26d5828f60664941946c266c7d166f32
This commit is contained in:
Michael Meeks
2014-05-24 13:39:59 +01:00
parent f2a01771ea
commit 02638a0865
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
external/cppunit/ExternalProject_cppunit.mk vendored
View File

@@ -13,15 +13,13 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\
build \ build \
)) ))
ifeq ($(OS)$(COM),WNTMSC) ifeq ($(OS)$(COM),WNTMSC)
$(call gb_ExternalProject_get_state_target,cppunit,build) : $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
msbuild.exe cppunit_dll.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0)" \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0) \ && msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \
&& cd ../DllPlugInTester \ && cd ../DllPlugInTester \
&& msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0) \
,src/cppunit) ,src/cppunit)
else else

1
external/cppunit/UnpackedTarball_cppunit.mk vendored
View File

@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/unix.patch \ external/cppunit/unix.patch \
external/cppunit/wundef.patch \ external/cppunit/wundef.patch \
external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 \ external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 \
external/cppunit/enable-win32-debug.patch \
)) ))
ifeq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\

18
external/cppunit/enable-win32-debug.patch vendored Normal file
View File

@@ -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>

1
sal/cppunittester/cppunittester.cxx
View File

@@ -214,6 +214,7 @@ public:
std::cerr << "please check your PATH variable and re-autogen.\n"; std::cerr << "please check your PATH variable and re-autogen.\n";
} }
#endif #endif
std::cerr << "Path is '" << getenv("PATH") << "'\n";
return false; return false;
} }
#endif #endif