external/cppunit/ExternalProject_cppunit.mk | 8 +++----- external/cppunit/UnpackedTarball_cppunit.mk | 1 + sal/cppunittester/cppunittester.cxx | 1 + 3 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 526fa445c7f800852ccb4d7dec053c022786dfe2 Author: Michael Meeks <[email protected]> Date: Sat May 24 13:39:59 2014 +0100 cppunit: always compile with debugging symbols on windows. Also cleanup some makefile pieces and give better error warnings. Change-Id: I9f20d60f26d5828f60664941946c266c7d166f32 diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 8e74259..b6ce25a1 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 /p:VisualStudioVersion=11.0) \ + PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /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 /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 86dc77d..6ec1e5b 100644 --- a/external/cppunit/UnpackedTarball_cppunit.mk +++ b/external/cppunit/UnpackedTarball_cppunit.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ external/cppunit/windows.patch \ external/cppunit/unix.patch \ external/cppunit/wundef.patch \ + external/cppunit/enable-win32-debug.patch \ )) ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 7ac8ab5..b42bf3a 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -214,6 +214,7 @@ public: std::cerr << "please check your PATH variable and re-autogen.\n"; } #endif + std::cerr << "Path is '" << getenv("PATH") << "'\n"; return false; } #endif _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
