diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-20 18:08:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-21 08:27:19 +0000 |
| commit | 9116e05c56f220d41a72dfc4c2daafbcd5f3ab61 (patch) | |
| tree | 44e692c58d960587f880ca6f650a605d4c31c935 /external/cppunit | |
| parent | fb896ebc7e47f4a63c5c4dd1415a8b4d73c0c93f (diff) | |
Fix check for non-empty UCRTVERSION
...introduced with b862cbdd345ec57c2595629ded6a3969e1e65d56 "Support MSVC 15.0",
but $(filter ...,) always expands to the empty string, and this is probably what
was intended.
Change-Id: I5865ea13ba3c3d52402bcba48f4f770f6c2b8862
Reviewed-on: https://gerrit.libreoffice.org/34482
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
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 6722a27c381f..ac84aca809f6 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 $(filter $(UCRTVERSION),),,/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \ + $(if $(UCRTVERSION),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \ && msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \ && cd ../DllPlugInTester \ && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \ |