[openrtm-commit:02538] r205 - trunk/ImageProcessing/opencv

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-03-27 17:33:25 +0900 (Mon, 27 Mar 2017)
New Revision: 205

Modified:
   trunk/ImageProcessing/opencv/ip-build.bat
Log:
[compat,->RELEASE_1_2_0]  vc15 (vc2017) has been supported.

Modified: trunk/ImageProcessing/opencv/ip-build.bat
===================================================================
--- trunk/ImageProcessing/opencv/ip-build.bat	2017-03-07 08:09:17 UTC (rev 204)
+++ trunk/ImageProcessing/opencv/ip-build.bat	2017-03-27 08:33:25 UTC (rev 205)
@@ -144,6 +144,12 @@
    set PLATFORMTOOL=/p:PlatformToolset=v140
    goto MSBUILDx86
    )
+if %VC_VERSION% == 15 (
+   call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
+   set VCTOOLSET=15.0
+   set PLATFORMTOOL=/p:PlatformToolset=v141
+   goto MSBUILDx86
+   )
 
 @rem ------------------------------------------------------------
 @rem Build (VC2008 x86)
@@ -224,6 +230,12 @@
    set PLATFORMTOOL=/p:PlatformToolset=v140
    goto MSBUILDx64
    )
+if /i %VC_VERSION% == 15 (
+   call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+   set VCTOOLSET=15.0
+   set PLATFORMTOOL=/p:PlatformToolset=v141
+   goto MSBUILDx64
+   )
 
 @rem ------------------------------------------------------------
 @rem Build (VC2010- x64)