[openrtm-commit:00650] r2295 - branches/test/OpenRTM-aist/win32/OpenRTM-aist/installer

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2012-02-03 18:56:22 +0900 (Fri, 03 Feb 2012)
New Revision: 2295

Modified:
   branches/test/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix.cmd.in
Log:
Moved to the installer/autowix.cmd the build process of OpenCV-RTC.

Modified: branches/test/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix.cmd.in
===================================================================
--- branches/test/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix.cmd.in	2012-02-03 08:32:49 UTC (rev 2294)
+++ branches/test/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix.cmd.in	2012-02-03 09:56:22 UTC (rev 2295)
@@ -66,15 +66,6 @@
 set INCLUDE_RTSE=YES
 set INCLUDE_OPENRTP=YES
 
- at rem ============================================================
- at rem build OpenCV-RTC
- at rem ============================================================
-
-cd %OPENCV_RTC_ROOT%
-call copyprops.bat
-msbuild /M:2 /t:rebuild ImageProcessing_opencv.sln
-cd %RTM_ROOT%\installer
-
 if not exist OpenRTP_inc.wxs (
    cd OpenRTP
 rem set TMP_PYTHONPATH=%PYTHONPATH%
@@ -138,6 +129,15 @@
 )
 set INCLUDE_OPENCV_RTC=YES
 
+ at rem ============================================================
+ at rem build OpenCV-RTC
+ at rem ============================================================
+
+cd %OPENCV_RTC_ROOT%
+call copyprops.bat
+msbuild /M:2 /t:rebuild ImageProcessing_opencv.sln
+cd %RTM_ROOT%\installer
+
 if not exist OpenCV-RTC_inc.wxs (
    cd OpenCV-RTC
    set TMP_PYTHONPATH=%PYTHONPATH%