[openrtm-commit:01686] r175 - trunk/ImageProcessing/opencv

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-01-29 16:12:16 +0900 (Fri, 29 Jan 2016)
New Revision: 175

Removed:
   trunk/ImageProcessing/opencv/build_vc10.bat
Modified:
   trunk/ImageProcessing/opencv/ip-build.bat
Log:
vc14 support has been added. build_vc10.bat has been removed.

Deleted: trunk/ImageProcessing/opencv/build_vc10.bat
===================================================================
--- trunk/ImageProcessing/opencv/build_vc10.bat	2015-07-23 06:32:02 UTC (rev 174)
+++ trunk/ImageProcessing/opencv/build_vc10.bat	2016-01-29 07:12:16 UTC (rev 175)
@@ -1,33 +0,0 @@
- at rem
- at rem This is a batch file to build OpenCV-rtcs. 
- at rem
- at rem Using:
- at rem   + Please install the following tools beforehand. 
- at rem     -- cmake
- at rem     -- vc2010
- at rem     -- OpenCV
- at rem   + Please set path of cmake and vc2010.  
- at rem
-
- at rem @set OPENCV_ROOT=C:\Program Files (x86)\OpenRTM-aist\1.1\OpenCV2.3
-
- at set WindowsSdkDir=
- at for /F "tokens=1,2*" %%i in ('reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows" /v "CurrentInstallFolder"') DO (
-	if "%%i"=="CurrentInstallFolder" (
-		set "WindowsSdkDir=%%k"
-	)
-)
-
- at rem @set PATH="C:\Program Files (x86)\CMake 2.8\bin";"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\BIN";"c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319";"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcpackages";%PATH%
- at set PATH="c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319";%PATH%
-
-echo Generating SoLutio files / WorkSpace.
-if not exist "work" (
-	mkdir work
-)
-cd work
-cmake .. -G "Visual Studio 10"
-
-msbuild /m:2 /t:rebuild /p:configuration=release components\DirectShowCam\BaseClasses\BaseClasses.sln
-msbuild /m:2 /t:build /p:configuration=release ImageProcessing_opencv.sln
-cd ../

Modified: trunk/ImageProcessing/opencv/ip-build.bat
===================================================================
--- trunk/ImageProcessing/opencv/ip-build.bat	2015-07-23 06:32:02 UTC (rev 174)
+++ trunk/ImageProcessing/opencv/ip-build.bat	2016-01-29 07:12:16 UTC (rev 175)
@@ -39,14 +39,14 @@
 set OPENCV_RTC_ROOT=%~dp0
 
 if not DEFINED ARCH       set ARCH=x86
-if not DEFINED VC_VERSION set VC_VERSION=10
+if not DEFINED VC_VERSION set VC_VERSION=12
 if not DEFINED PYTHON_DIR set PYTHON_DIR=c:\python27
-if not DEFINED OpenCV_DIR set OpenCV_DIR=C:\distribution\OpenCV-2.4.9
-if not DEFINED RTM_ROOT   set RTM_ROOT=C:\distribution\OpenRTM-aist-rv2567
-if not DEFINED OMNI_ROOT  set OMNI_ROOT=C:\distribution\omniORB-4.1.7-win32-vc10
+if not DEFINED OpenCV_DIR set OpenCV_DIR=C:\distribution\OpenCV-2.4.11
+if not DEFINED RTM_ROOT   set RTM_ROOT=C:\distribution\OpenRTM-aist
+if not DEFINED OMNI_ROOT  set OMNI_ROOT=%RTM_ROOT%\omniORB
 
 set COIL_ROOT=%RTM_ROOT%\coil
-set OpenRTM_Dir=%RTM_ROOT%\cmake
+set OpenRTM_DIR=%RTM_ROOT%\cmake
 
 @rem ------------------------------------------------------------
 @rem Printing env variables
@@ -142,6 +142,12 @@
    set PLATFORMTOOL=/p:PlatformToolset=v120
    goto MSBUILDx86
    )
+if %VC_VERSION% == 14 (
+   call C:\"Program Files (x86)"\"Microsoft Visual Studio 14.0"\VC\vcvarsall.bat x86
+   set VCTOOLSET=14.0
+   set PLATFORMTOOL=/p:PlatformToolset=v140
+   goto MSBUILDx86
+   )
 
 @rem ------------------------------------------------------------
 @rem Build (VC2008 x86)
@@ -216,6 +222,12 @@
    set PLATFORMTOOL=/p:PlatformToolset=v120
    goto MSBUILDx64
    )
+if /i %VC_VERSION% == 14 (
+   call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+   set VCTOOLSET=14.0
+   set PLATFORMTOOL=/p:PlatformToolset=v140
+   goto MSBUILDx64
+   )
 
 @rem ------------------------------------------------------------
 @rem Build (VC2010- x64)