diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-24 21:25:30 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-02 14:01:18 +0000 |
| commit | c214802883054df349650835f86f9ea9468b778a (patch) | |
| tree | 543e2ea630c020fa3c1433f1c4c16cba1897d31c /external | |
| parent | aae9c47270fed82c2f53f3d2cf701991c9c4a4a3 (diff) | |
Fix coinmp on MSVC 14.0
Change-Id: I59372b51ce4aef2e4a923787db61e20cfd96a9fa
Reviewed-on: https://gerrit.libreoffice.org/17342
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rwxr-xr-x[-rw-r--r--] | external/coinmp/ExternalProject_coinmp.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index d8bfaac944bb..7b6cd07f6229 100644..100755 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -21,6 +21,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) : /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ $(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) \ ,CoinMP/MSVisualStudio/v9) else |