[openrtm-commit:01445] r153 - branches/newCMakeForVC2010/ImageProcessing/opencv/components

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-05-02 09:49:55 +0900 (Fri, 02 May 2014)
New Revision: 153

Modified:
   branches/newCMakeForVC2010/ImageProcessing/opencv/components/CMakeLists.txt
Log:
Modified the build conditions of the camera components. refs #2704

Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/CMakeLists.txt	2014-04-25 04:10:40 UTC (rev 152)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/CMakeLists.txt	2014-05-02 00:49:55 UTC (rev 153)
@@ -12,10 +12,14 @@
 add_subdirectory(Chromakey)
 add_subdirectory(Dilationerosion)
 
-if ($ENV{VC_VERSION} MATCHES "10" OR $ENV{VC_VERSION} MATCHES "9")
-  add_subdirectory(DirectShowCam)
-else()
-  add_subdirectory(MFCamera)
+if (WIN32)
+  if ($ENV{VC_VERSION} MATCHES "10" OR $ENV{VC_VERSION} MATCHES "9")
+    if(DIRECTSHOW_FOUND)
+      add_subdirectory(DirectShowCam)
+    endif()
+  else()
+    add_subdirectory(MFCamera)
+  endif()
 endif()
 
 add_subdirectory(Edge)