diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-02-03 18:59:41 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-02-04 11:51:00 +0100 |
| commit | 815a8346e1cadfcf9861f5341f3bb0cbc00e3e28 (patch) | |
| tree | ae48cf3099220462377506a649631cc3960ce1e1 | |
| parent | 27928a11cd150d7538937109326da295adebe844 (diff) | |
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.behrens@allotropia.de>
(cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)
Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
| -rw-r--r-- | external/postgresql/ExternalProject_postgresql.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index 1e0c7d848047..2d360134e6ba 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 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \ + $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \ + $(if $(filter 150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \ $(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) libpq \ ,src/tools/msvc) |