From 09c0a96eb3ea8d48e99ed50ae7d13d23f70a0c6c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 26 May 2014 11:39:06 +0200 Subject: externals: do not use "v110_xp" when building with MSVC 2012 and SDK 8.0 Change-Id: I40bc9e4c31e270f29cc145b5d2f3544cad586bf7 --- external/cppunit/ExternalProject_cppunit.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'external/cppunit') diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 30a5905bcc00..2f3217da3d2b 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -16,7 +16,9 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\ ifeq ($(OS)$(COM),WNTMSC) $(call gb_ExternalProject_get_state_target,cppunit,build) : $(call gb_ExternalProject_run,build,\ - PROFILEFLAGS="$(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=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ + /p:VisualStudioVersion=11.0)" \ && msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \ && cd ../DllPlugInTester \ && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \ -- cgit