diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2017-02-21 23:08:19 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2017-02-22 04:33:16 +0000 |
| commit | f0c7cbe1d8505d3c1f5a2b2253efda35542c898b (patch) | |
| tree | 3c5ff4409fa8b2f40ff03157bb3c64edafa36283 /external/cppunit | |
| parent | 0999c403a0a7cc9248a1773042ad09fd85004267 (diff) | |
MSVC 14.0: Make it work with older SDK version
Change-Id: I50a9e8b122250af445c2a1b3d0941d508e027318
Reviewed-on: https://gerrit.libreoffice.org/34528
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'external/cppunit')
| -rw-r--r-- | external/cppunit/ExternalProject_cppunit.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index ac84aca809f6..2a5a934d384e 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -21,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \ $(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 $(UCRTVERSION),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \ + $(if $(filter 150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \ && msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \ && cd ../DllPlugInTester \ && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \ |