external/coinmp/ExternalProject_coinmp.mk | 2 +-
external/cppunit/ExternalProject_cppunit.mk | 2 +-
external/libgltf/ExternalProject_libgltf.mk | 2 +-
external/python3/ExternalProject_python3.mk | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 0b684fa3e919dea3a482f85580c1266b81598f70
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 9 16:06:09 2014 +0200
VS2013: Override ToolsVersion setting
Otherwise those external projects will fail, because with only VS2013
installed
there is no ToolsVersion 4.0 (which is set inside the VC projects files).
http://msdn.microsoft.com/en-us/library/bb383985.aspx
Change-Id: I144ba1ef95372226ebadb082e3a78155cca316fd
diff --git a/external/coinmp/ExternalProject_coinmp.mk
b/external/coinmp/ExternalProject_coinmp.mk
index c5f181d..3c54e42 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -21,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
/p:Platform=Win32 \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100
/p:VisualStudioVersion=10.0) \
$(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) \
+ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
,CoinMP/MSVisualStudio/v9)
else
diff --git a/external/cppunit/ExternalProject_cppunit.mk
b/external/cppunit/ExternalProject_cppunit.mk
index 5c62c96..b5b7f8a 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(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)" \
+ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0)" \
&& msbuild.exe cppunit_dll.vcxproj
/p:Configuration=$${PROFILEFLAGS} \
&& cd ../DllPlugInTester \
&& msbuild.exe DllPlugInTester.vcxproj
/p:Configuration=$${PROFILEFLAGS} \
diff --git a/external/libgltf/ExternalProject_libgltf.mk
b/external/libgltf/ExternalProject_libgltf.mk
index cd84dcd..c402e59 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \
/p:Configuration=$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0) \
+ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index cabff00..21a3f11 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(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) \
+ /p:VisualStudioVersion=12.0 /ToolsVersion:12.0)
\
,PCBuild)
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
