Skip to content

DirectShowCam関係ファイルの削除 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
n-ando merged 3 commits into from
Jun 14, 2019
Merged

DirectShowCam関係ファイルの削除 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06fd163
[compat,->RELEASE_1_2_1] Removed unnecessary code in OpenRTM 1.2.1.
n-kawauchi Jun 7, 2019
db147de
Updated OpenCVCamera version to 1.2.1.
Jun 14, 2019
018922b
ImageProcessing version number has been defined.
n-kawauchi Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions opencv/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
9 changes: 1 addition & 8 deletions opencv/components/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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()
Expand Down
11 changes: 0 additions & 11 deletions opencv/components/DirectShowCam/.project
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions opencv/components/DirectShowCam/BaseClasses/CMakeLists.txt
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions opencv/components/DirectShowCam/BaseClasses/FindDirectShow.cmake
View file
Open in desktop

This file was deleted.

172 changes: 0 additions & 172 deletions opencv/components/DirectShowCam/CMakeLists.txt
View file
Open in desktop

This file was deleted.

Loading