external/postgresql/ExternalProject_postgresql.mk | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c3039807bc5167f14e85ea54835cb7db310f9bc0
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Feb 3 18:59:41 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Nov 29 14:38:28 2021 +0100
postgresql: try to cargo-cult MSBuild arguments
Extremely unclear to me whether these are useful or necessary,
but the other MSBuild ones have them.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
(cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)
Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
diff --git a/external/postgresql/ExternalProject_postgresql.mk
b/external/postgresql/ExternalProject_postgresql.mk
index 2812a80764a1..9df01cae9ef3 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,8 +24,11 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
$(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_ExternalProject_run,build,\
- MSBFLAGS=/p:Platform=$(gb_MSBUILD_PLATFORM) \
- $(PERL) build.pl $(gb_MSBUILD_CONFIG) libpq \
+ 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)
else
