[openrtm-commit:01461] r168 - branches/newCMakeForVC2010/ImageProcessing/opencv

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-06-19 11:33:59 +0900 (Thu, 19 Jun 2014)
New Revision: 168

Modified:
   branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat
Log:
Changed to the path specification corresponding to the Jenkins job.

Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat	2014-06-18 05:34:54 UTC (rev 167)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat	2014-06-19 02:33:59 UTC (rev 168)
@@ -38,20 +38,16 @@
 set PATH=%PATH%;C:\cygwin64\bin
 set OPENCV_RTC_ROOT=%~dp0
 
-set OpenCV_DIR=C:\distribution\OpenCV-2.4.9
-set PYTHON_DIR=c:\python27;
-set RTM_ROOT=C:\distribution\OpenRTM-aist-rv2567
-set OMNI_ROOT=C:\distribution\omniORB-4.1.7-win64-vc10
-set ARCH=x86_64
-set VC_VERSION=10
+if not DEFINED ARCH       set ARCH=x86
+if not DEFINED VC_VERSION set VC_VERSION=10
+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
 
 set COIL_ROOT=%RTM_ROOT%\coil
 set OpenRTM_Dir=%RTM_ROOT%\cmake
 
-
-if %ARCH% ==              set ARCH=x86
-if %VC_VERSION% ==        set VC_VERSION=10
-
 @rem ------------------------------------------------------------
 @rem Printing env variables
 echo Environment variables: