[openrtm-commit:01447] r155 - branches/newCMakeForVC2010/ImageProcessing/opencv

[openrtm ＠ openrtm.org]

Author: harumi
Date: 2014-05-02 15:42:13 +0900 (Fri, 02 May 2014)
New Revision: 155

Modified:
   branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat
Log:
fix ip-build.bat for jenkins

Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat	2014-05-02 01:02:00 UTC (rev 154)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat	2014-05-02 06:42:13 UTC (rev 155)
@@ -37,18 +37,24 @@
 
 set OPENCV_RTC_ROOT=%~dp0
 set BUILD_DIR=%OPENCV_RTC_ROOT%\work
-set PYTHON_DIR=c:\python27;
 set OpenCV_DIR=C:\distribution\OpenCV2.4.8-win32
 set Baseclasses_DIR=C:\distribution\baseclasses
 
-set RTM_ROOT=C:\distribution\OpenRTM-aist-rv2566
+rem set PYTHON_DIR=c:\python27;
+if %PYTHON_DIR% ==         set PYTHON_DIR=c:\python27; 
+
+rem set RTM_ROOT=C:\distribution\OpenRTM-aist-rv2566
+if %RTM_ROOT% ==         set RTM_ROOT==C:\distribution\OpenRTM-aist-rv2566
+
 set COIL_ROOT=%RTM_ROOT%\coil
 set OpenRTM_Dir=%RTM_ROOT%\cmake
 
-set OMNI_ROOT=C:\distribution\omniORB-4.1.7-win32-vc10
-set ARCH=x86
-set VC_VERSION=10
+rem set OMNI_ROOT=C:\distribution\omniORB-4.1.7-win32-vc10
+if %OMNI_ROOT% ==         set OMNI_ROOT=C:\distribution\omniORB-4.1.7-win32-vc10
 
+if %ARCH% ==              set ARCH=x86
+if %VC_VERSION% ==        set VC_VERSION=10
+
 @rem ------------------------------------------------------------
 @rem Printing env variables
 echo Environment variables: