Merge pull request #10 from n-kawauchi/for_RTM121

DirectShowCam関係ファイルの削除

Author: n-ando

opencv/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
 project(ImageProcessing)
+set(PROJECT_VERSION 1.2.1 CACHE STRING "ImageProcessing version")
 set(TOP_PROJECT_NAME ${PROJECT_NAME})
 string(TOLOWER ${TOP_PROJECT_NAME} TOP_PROJECT_NAME_LOWER)
 SUBDIRS(components)

opencv/components/CMakeLists.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
 project(components)
-include(DirectShowCam/BaseClasses/FindDirectShow.cmake)
 include(PGRCamera/cmake/FindFlyCapture.cmake)
 
 add_subdirectory(TkCalibGUI)
@@ -12,14 +11,8 @@ add_subdirectory(CameraViewer)
 add_subdirectory(Chromakey)
 add_subdirectory(Dilationerosion)
 
-
-
 if (WIN32)
-  if (${CMAKE_GENERATOR} MATCHES [[Visual Studio (9|10) (2008|2010)(| Win64| ARM)]])
-    if(DIRECTSHOW_FOUND)
-      add_subdirectory(DirectShowCam)
-    endif()
-  else()
+  if (NOT ${CMAKE_GENERATOR} MATCHES [[Visual Studio 10]])
     add_subdirectory(MFCamera)
   endif()
 endif()