From aad28ac2ac2b76d7ab1ffad7d7fe62229f59d066 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 3 Feb 2021 18:59:41 +0100 Subject: postgresql: try to cargo-cult MSBuild arguments Extremely unclear to me whether these are useful or necessary, but the other MSBuild ones have them. Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a) --- external/postgresql/ExternalProject_postgresql.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index 001c3f961ac8..9df01cae9ef3 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -24,7 +24,10 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build)) $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_ExternalProject_run,build,\ - MSBFLAGS=/p:Platform=$(if $(filter X86_64,$(CPUNAME)),x64,Win32) \ + MSBFLAGS="/p:Platform=$(if $(filter X86_64,$(CPUNAME)),x64,Win32) \ + $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \ + $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \ + $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \ $(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) libpq \ ,src/tools/msvc) -- cgit