external/coinmp/ExternalProject_coinmp.mk | 2 +-
external/cppunit/ExternalProject_cppunit.mk | 2 +-
external/lcms2/ExternalProject_lcms2.mk | 2 +-
external/libgltf/ExternalProject_libgltf.mk | 2 +-
external/python3/ExternalProject_python3.mk | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9116e05c56f220d41a72dfc4c2daafbcd5f3ab61
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Feb 20 18:08:54 2017 +0100
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 <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/coinmp/ExternalProject_coinmp.mk
b/external/coinmp/ExternalProject_coinmp.mk
index a09f266..3e7f0cc 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -22,7 +22,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,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)) \
,CoinMP/MSVisualStudio/v9)
else
diff --git a/external/cppunit/ExternalProject_cppunit.mk
b/external/cppunit/ExternalProject_cppunit.mk
index 6722a27..ac84aca 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} \
diff --git a/external/lcms2/ExternalProject_lcms2.mk
b/external/lcms2/ExternalProject_lcms2.mk
index b54b368..a6f03f3 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -22,7 +22,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,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)) \
/p:Configuration=$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64)
/p:TargetName=lcms2 \
,Projects/VC2013/lcms2_DLL)
diff --git a/external/libgltf/ExternalProject_libgltf.mk
b/external/libgltf/ExternalProject_libgltf.mk
index 94e20b6..047e90d 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,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)) \
'/p:AdditionalIncludeDirectories=$(subst
$(WHITESPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes))))' \
/p:AdditionalLibraryDirectories=$(if
$(SYSTEM_EPOXY),,"$(subst /,\,$(call
gb_UnpackedTarball_get_dir,epoxy))\lib\$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
,build/win32)
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 2f28cea..04fa0b5 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,python3,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)) \
,PCBuild)
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
