diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-09 16:06:09 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-09 16:47:52 +0200 |
| commit | 0b684fa3e919dea3a482f85580c1266b81598f70 (patch) | |
| tree | c428f1552c7259e1785788325eacd9ace2c31ef4 /external | |
| parent | 227f3aab1791ffde82fe930ea1c9f7ed4ed2d82d (diff) | |
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
Diffstat (limited to 'external')
| -rw-r--r-- | external/coinmp/ExternalProject_coinmp.mk | 2 | ||||
| -rw-r--r-- | external/cppunit/ExternalProject_cppunit.mk | 2 | ||||
| -rw-r--r-- | external/libgltf/ExternalProject_libgltf.mk | 2 | ||||
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index c5f181df03c6..3c54e423b282 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 5c62c9602759..b5b7f8a04999 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 cd84dcd981e4..c402e59db245 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 cabff00559f4..21a3f110a747 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 |