diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-08 10:51:50 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-08 14:54:10 +0200 |
| commit | 8e779c062a22a5755cae2c86787e16f59bfe4907 (patch) | |
| tree | dfaa5566eb5813a9d1c029110fb7d8971e2f1dae /external/cppunit | |
| parent | Simplify VS IDE integration generation (diff) | |
| download | core-8e779c062a22a5755cae2c86787e16f59bfe4907.tar.gz core-8e779c062a22a5755cae2c86787e16f59bfe4907.zip | |
Centralize VS-to-toolset mapping in configure
This allows to define the mapping once, and avoid modification in
multiple places each time a new VS version support is added
Change-Id: I93de4c9d78c3f67a0a2e157007e9d13b6f557937
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123163
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'external/cppunit')
| -rw-r--r-- | external/cppunit/ExternalProject_cppunit.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 996bf41761ae..e32bdb30f0b9 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -19,8 +19,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : $(call gb_ExternalProject_run,build,\ PROFILEFLAGS="$(gb_MSBUILD_CONFIG) \ /p:Platform=$(gb_MSBUILD_PLATFORM) \ - $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \ - $(if $(filter 170,$(VCVER)),/p:PlatformToolset=v143 /p:VisualStudioVersion=17.0 /ToolsVersion:Current) \ + /p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \ $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \ && msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \ && cd ../DllPlugInTester \ |