[openrtm-commit:02834] r216 - trunk/ImageProcessing/opencv

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-09-19 17:15:36 +0900 (Tue, 19 Sep 2017)
New Revision: 216

Modified:
   trunk/ImageProcessing/opencv/ip-build.bat
Log:
[compat,->RELEASE_1_2_0] vc2017 version has been changed from vc15 to vc141. refs #4172

Modified: trunk/ImageProcessing/opencv/ip-build.bat
===================================================================
--- trunk/ImageProcessing/opencv/ip-build.bat	2017-09-06 05:42:30 UTC (rev 215)
+++ trunk/ImageProcessing/opencv/ip-build.bat	2017-09-19 08:15:36 UTC (rev 216)
@@ -49,6 +49,12 @@
 set COIL_ROOT=%RTM_ROOT%\coil
 set OpenRTM_DIR=%RTM_ROOT%\cmake
 
+if %VC_VERSION% == 141 (
+  set VS_VERSION=15
+) else (
+  set VS_VERSION=%VC_VERSION%
+)
+
 @rem ------------------------------------------------------------
 @rem Printing env variables
 echo Environment variables:
@@ -96,7 +102,7 @@
 @rem start to cmake 32bit 
 @rem ============================================================
 :cmake_x86
-set VC_NAME="Visual Studio %VC_VERSION%"
+set VC_NAME="Visual Studio %VS_VERSION%"
 if %VC_VERSION% == 9  (
    cmake .. -G "Visual Studio 9 2008"
    goto x86
@@ -144,7 +150,7 @@
    set PLATFORMTOOL=/p:PlatformToolset=v140
    goto MSBUILDx86
    )
-if %VC_VERSION% == 15 (
+if %VC_VERSION% == 141 (
    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
@@ -186,7 +192,7 @@
 @rem start to cmake 64bit 
 @rem ============================================================
 :cmake_x86_64
-set VC_NAME="Visual Studio %VC_VERSION% Win64"
+set VC_NAME="Visual Studio %VS_VERSION% Win64"
 if %VC_VERSION% == 9  (
    echo 64bit compilation on Visual C++ 2008 is not supported. Aborting.
    goto END
@@ -230,7 +236,7 @@
    set PLATFORMTOOL=/p:PlatformToolset=v140
    goto MSBUILDx64
    )
-if /i %VC_VERSION% == 15 (
+if /i %VC_VERSION% == 141 (
    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