[openrtm-commit:00215] r55 - in trunk/ImageProcessing/opencv: . components components/DirectShowCam
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 7月 5日 (火) 15:42:24 JST
Author: fsi-katami
Date: 2011-07-05 15:42:24 +0900 (Tue, 05 Jul 2011)
New Revision: 55
Added:
trunk/ImageProcessing/opencv/components/DirectShowCam/Doxyfile.in
Modified:
trunk/ImageProcessing/opencv/build_vc10.bat
trunk/ImageProcessing/opencv/components/CMakeLists.txt
trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt
Log:
For vc2010. refs #1915
Modified: trunk/ImageProcessing/opencv/build_vc10.bat
===================================================================
--- trunk/ImageProcessing/opencv/build_vc10.bat 2011-06-28 06:08:23 UTC (rev 54)
+++ trunk/ImageProcessing/opencv/build_vc10.bat 2011-07-05 06:42:24 UTC (rev 55)
@@ -9,6 +9,14 @@
@rem + Please set path of cmake and vc2010.
@rem
+ at set OPENCV_ROOT=C:\distribution\OpenCV2.2
+ at set WindowsSdkDir=
+ at for /F "tokens=1,2*" %%i in ('reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows" /v "CurrentInstallFolder"') DO (
+ if "%%i"=="CurrentInstallFolder" (
+ set "WindowsSdkDir=%%k"
+ )
+)
+
@set PATH="C:\Program Files\CMake 2.8\bin";"C:\Program Files\Microsoft Visual Studio 10.0\VC\BIN";"c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319";"C:\Program Files\Microsoft Visual Studio 10.0\VC\vcpackages";%PATH%
echo Generating SoLutio files / WorkSpace.
Modified: trunk/ImageProcessing/opencv/components/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/CMakeLists.txt 2011-06-28 06:08:23 UTC (rev 54)
+++ trunk/ImageProcessing/opencv/components/CMakeLists.txt 2011-07-05 06:42:24 UTC (rev 55)
@@ -1,3 +1,3 @@
-SUBDIRS(Affine BackGroundSubtractionSimple Binarization Chromakey Dilationerosion Edge Findcontour Flip Histogram Houghline ImageCalibration ImageSubstraction ObjectTracking Perspective RockPaperScissors Rotate Scale Sepia SubStractCaptureImage Template Translate OpenCVCamera CameraViewer)
+SUBDIRS(Affine BackGroundSubtractionSimple Binarization Chromakey Dilationerosion DirectShowCam Edge Findcontour Flip Histogram Houghline ImageCalibration ImageSubstraction ObjectTracking Perspective RockPaperScissors Rotate Scale Sepia SubStractCaptureImage Template Translate OpenCVCamera CameraViewer)
#SUBDIRS(Affine BackGroundSubtractionSimple Binarization Chromakey Dilationerosion Edge Findcontour Flip Histogram Houghline ImageCalibration ImageSubstraction ObjectTracking PGRCamera Perspective RockPaperScissors Rotate Scale Sepia SubStractCaptureImage Template Translate OpenCVCamera CameraViewer)
#SUBDIRS(Affine BackGroundSubtractionSimple)
Modified: trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2011-06-28 06:08:23 UTC (rev 54)
+++ trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2011-07-05 06:42:24 UTC (rev 55)
@@ -91,6 +91,7 @@
list(APPEND INCLUDE_DIRS ${OPENCV_INCLUDE_DIRS})
list(APPEND LIBRARY_DIRS ${OPENCV_LIBRARY_DIRS})
list(APPEND LIBRARIES ${OPENCV_LIBRARIES})
+list(APPEND LIBRARIES "strmbase")
# add uninstall target
@@ -104,8 +105,11 @@
# target settings for library/executable
list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
+list(APPEND INCLUDE_DIRS "$ENV{WindowsSdkDir}/Samples/Multimedia/DirectShow/BaseClasses")
+
include_directories(${INCLUDE_DIRS})
+list(APPEND LIBRARY_DIRS ${PROJECT_SOURCE_DIR})
link_directories(${LIBRARY_DIRS})
add_definitions(${CFLAGS})
@@ -153,6 +157,26 @@
set_target_properties(${RTC_NAME}Comp PROPERTIES LINK_FLAGS "${LDFLAGS}")
endif()
+if(WIN32)
+ set (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${RTC_NAME}/)
+ set (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${RTC_NAME}Comp/)
+
+ ADD_CUSTOM_COMMAND(
+ TARGET ${RTC_NAME}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy
+ "${CMAKE_CURRENT_SOURCE_DIR}/${RTC_NAME}/Release/${RTC_NAME}.dll"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../../bin"
+ )
+ ADD_CUSTOM_COMMAND(
+ TARGET ${RTC_NAME}Comp
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy
+ "${CMAKE_CURRENT_SOURCE_DIR}/${RTC_NAME}Comp/Release/${RTC_NAME}Comp.exe"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../../bin"
+ )
+endif()
+
install(TARGETS ${RTC_NAME} LIBRARY DESTINATION "${INSTALL_PREFIX}"
ARCHIVE DESTINATION "${INSTALL_PREFIX}"
RUNTIME DESTINATION "${INSTALL_PREFIX}"
Added: trunk/ImageProcessing/opencv/components/DirectShowCam/Doxyfile.in
===================================================================
--- trunk/ImageProcessing/opencv/components/DirectShowCam/Doxyfile.in (rev 0)
+++ trunk/ImageProcessing/opencv/components/DirectShowCam/Doxyfile.in 2011-07-05 06:42:24 UTC (rev 55)
@@ -0,0 +1,487 @@
+
+# Project related configuration options
+
+DOXYFILE_ENCODING = UTF-8
+
+PROJECT_NAME = @PACKAGE_NAME@
+
+PROJECT_NUMBER = @PACKAGE_VERSION@
+
+OUTPUT_DIRECTORY = doc
+
+CREATE_SUBDIRS = NO
+
+OUTPUT_LANGUAGE = Japanese
+
+BRIEF_MEMBER_DESC = YES
+
+REPEAT_BRIEF = YES
+
+ABBREVIATE_BRIEF =
+
+ALWAYS_DETAILED_SEC = NO
+
+INLINE_INHERITED_MEMB = NO
+
+FULL_PATH_NAMES = YES
+
+STRIP_FROM_PATH =
+
+STRIP_FROM_INC_PATH =
+
+SHORT_NAMES = NO
+
+JAVADOC_AUTOBRIEF = NO
+
+QT_AUTOBRIEF = NO
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+INHERIT_DOCS = YES
+
+SEPARATE_MEMBER_PAGES = NO
+
+TAB_SIZE = 8
+
+ALIASES =
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+EXTENSION_MAPPING =
+
+BUILTIN_STL_SUPPORT = NO
+
+CPP_CLI_SUPPORT = NO
+
+SIP_SUPPORT = NO
+
+IDL_PROPERTY_SUPPORT = YES
+
+DISTRIBUTE_GROUP_DOC = NO
+
+SUBGROUPING = YES
+
+TYPEDEF_HIDES_STRUCT = NO
+
+SYMBOL_CACHE_SIZE = 0
+
+
+# Build related configuration options
+
+EXTRACT_ALL = NO
+
+EXTRACT_PRIVATE = NO
+
+EXTRACT_STATIC = NO
+
+EXTRACT_LOCAL_CLASSES = YES
+
+EXTRACT_LOCAL_METHODS = NO
+
+EXTRACT_ANON_NSPACES = NO
+
+HIDE_UNDOC_MEMBERS = NO
+
+HIDE_UNDOC_CLASSES = NO
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+HIDE_IN_BODY_DOCS = NO
+
+INTERNAL_DOCS = NO
+
+CASE_SENSE_NAMES = NO
+
+HIDE_SCOPE_NAMES = NO
+
+SHOW_INCLUDE_FILES = YES
+
+FORCE_LOCAL_INCLUDES = NO
+
+INLINE_INFO = YES
+
+SORT_MEMBER_DOCS = YES
+
+SORT_BRIEF_DOCS = NO
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+SORT_GROUP_NAMES = NO
+
+SORT_BY_SCOPE_NAME = YES
+
+GENERATE_TODOLIST = YES
+
+GENERATE_TESTLIST = YES
+
+GENERATE_BUGLIST = YES
+
+GENERATE_DEPRECATEDLIST = YES
+
+ENABLED_SECTIONS =
+
+MAX_INITIALIZER_LINES = 30
+
+SHOW_USED_FILES = YES
+
+SHOW_DIRECTORIES = NO
+
+SHOW_FILES = YES
+
+SHOW_NAMESPACES = YES
+
+FILE_VERSION_FILTER =
+
+LAYOUT_FILE =
+
+
+# configuration options related to warning and progress messages
+
+QUIET = NO
+
+WARNINGS = YES
+
+WARN_IF_UNDOCUMENTED = YES
+
+WARN_IF_DOC_ERROR = YES
+
+WARN_NO_PARAMDOC = NO
+
+WARN_FORMAT = "$file:$line: $text"
+
+WARN_LOGFILE =
+
+
+# configuration options related to the input files
+
+INPUT = @CMAKE_CURRENT_SOURCE_DIR@
+
+INPUT_ENCODING = UTF-8
+
+FILE_PATTERNS = *.cpp *.h *.idl
+
+RECURSIVE = YES
+
+EXCLUDE = _CPack_Packages
+
+EXCLUDE_SYMLINKS = NO
+
+EXCLUDE_PATTERNS = .svn .git
+
+EXCLUDE_SYMBOLS =
+
+EXAMPLE_PATH =
+
+EXAMPLE_PATTERNS =
+
+EXAMPLE_RECURSIVE = NO
+
+IMAGE_PATH =
+
+INPUT_FILTER =
+
+FILTER_PATTERNS =
+
+FILTER_SOURCE_FILES = NO
+
+
+# configuration options related to source browsing
+
+SOURCE_BROWSER = NO
+
+INLINE_SOURCES = NO
+
+STRIP_CODE_COMMENTS = YES
+
+REFERENCED_BY_RELATION = NO
+
+REFERENCES_RELATION = NO
+
+REFERENCES_LINK_SOURCE = YES
+
+USE_HTAGS = NO
+
+VERBATIM_HEADERS = YES
+
+
+# configuration options related to the alphabetical class index
+
+ALPHABETICAL_INDEX = YES
+
+COLS_IN_ALPHA_INDEX = 5
+
+IGNORE_PREFIX =
+
+
+# configuration options related to the HTML output
+
+GENERATE_HTML = YES
+
+HTML_OUTPUT = html
+
+HTML_FILE_EXTENSION = .html
+
+HTML_HEADER =
+
+HTML_FOOTER =
+
+HTML_STYLESHEET =
+
+HTML_COLORSTYLE_HUE = 220
+
+HTML_COLORSTYLE_SAT = 100
+
+HTML_COLORSTYLE_GAMMA = 80
+
+HTML_TIMESTAMP = YES
+
+HTML_ALIGN_MEMBERS = YES
+
+HTML_DYNAMIC_SECTIONS = NO
+
+GENERATE_DOCSET = NO
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+DOCSET_PUBLISHER_NAME = Publisher
+
+GENERATE_HTMLHELP = NO
+
+CHM_FILE =
+
+HHC_LOCATION =
+
+GENERATE_CHI = NO
+
+CHM_INDEX_ENCODING =
+
+BINARY_TOC = NO
+
+TOC_EXPAND = NO
+
+GENERATE_QHP = NO
+
+QCH_FILE =
+
+QHP_NAMESPACE = org.doxygen.Project
+
+QHP_VIRTUAL_FOLDER = doc
+
+QHP_CUST_FILTER_NAME =
+
+QHP_CUST_FILTER_ATTRS =
+
+QHP_SECT_FILTER_ATTRS =
+
+QHG_LOCATION =
+
+GENERATE_ECLIPSEHELP = NO
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+DISABLE_INDEX = NO
+
+ENUM_VALUES_PER_LINE = 4
+
+GENERATE_TREEVIEW = NO
+
+USE_INLINE_TREES = NO
+
+TREEVIEW_WIDTH = 250
+
+EXT_LINKS_IN_WINDOW = NO
+
+FORMULA_FONTSIZE = 10
+
+FORMULA_TRANSPARENT = YES
+
+SEARCHENGINE = YES
+
+SERVER_BASED_SEARCH = NO
+
+
+# configuration options related to the LaTeX output
+
+GENERATE_LATEX = NO
+
+LATEX_OUTPUT = latex
+
+LATEX_CMD_NAME = latex
+
+MAKEINDEX_CMD_NAME = makeindex
+
+COMPACT_LATEX = NO
+
+PAPER_TYPE = a4wide
+
+EXTRA_PACKAGES =
+
+LATEX_HEADER =
+
+PDF_HYPERLINKS = YES
+
+USE_PDFLATEX = YES
+
+LATEX_BATCHMODE = NO
+
+LATEX_HIDE_INDICES = NO
+
+LATEX_SOURCE_CODE = NO
+
+
+# configuration options related to the RTF output
+
+GENERATE_RTF = NO
+
+RTF_OUTPUT = rtf
+
+COMPACT_RTF = NO
+
+RTF_HYPERLINKS = NO
+
+RTF_STYLESHEET_FILE =
+
+RTF_EXTENSIONS_FILE =
+
+
+# configuration options related to the man page output
+
+GENERATE_MAN = NO
+
+MAN_OUTPUT = man
+
+MAN_EXTENSION = .3
+
+MAN_LINKS = NO
+
+
+# configuration options related to the XML output
+
+GENERATE_XML = NO
+
+XML_OUTPUT = xml
+
+XML_SCHEMA =
+
+XML_DTD =
+
+XML_PROGRAMLISTING = YES
+
+
+# configuration options for the AutoGen Definitions output
+
+GENERATE_AUTOGEN_DEF = NO
+
+
+# configuration options related to the Perl module output
+
+GENERATE_PERLMOD = NO
+
+PERLMOD_LATEX = NO
+
+PERLMOD_PRETTY = YES
+
+PERLMOD_MAKEVAR_PREFIX =
+
+
+# Configuration options related to the preprocessor
+
+ENABLE_PREPROCESSING = YES
+
+MACRO_EXPANSION = NO
+
+EXPAND_ONLY_PREDEF = NO
+
+SEARCH_INCLUDES = YES
+
+INCLUDE_PATH =
+
+INCLUDE_FILE_PATTERNS =
+
+PREDEFINED =
+
+EXPAND_AS_DEFINED =
+
+SKIP_FUNCTION_MACROS = YES
+
+
+# Configuration::additions related to external references
+
+TAGFILES =
+
+GENERATE_TAGFILE =
+
+ALLEXTERNALS = NO
+
+EXTERNAL_GROUPS = YES
+
+PERL_PATH = /usr/bin/perl
+
+
+# Configuration options related to the dot tool
+
+CLASS_DIAGRAMS = YES
+
+MSCGEN_PATH =
+
+HIDE_UNDOC_RELATIONS = YES
+
+HAVE_DOT = NO
+
+DOT_NUM_THREADS = 0
+
+DOT_FONTNAME = FreeSans.ttf
+
+DOT_FONTSIZE = 10
+
+DOT_FONTPATH =
+
+CLASS_GRAPH = YES
+
+COLLABORATION_GRAPH = YES
+
+GROUP_GRAPHS = YES
+
+UML_LOOK = YES
+
+TEMPLATE_RELATIONS = NO
+
+INCLUDE_GRAPH = YES
+
+INCLUDED_BY_GRAPH = YES
+
+CALL_GRAPH = NO
+
+CALLER_GRAPH = NO
+
+GRAPHICAL_HIERARCHY = YES
+
+DIRECTORY_GRAPH = YES
+
+DOT_IMAGE_FORMAT = png
+
+DOT_PATH =
+
+DOTFILE_DIRS =
+
+DOT_GRAPH_MAX_NODES = 50
+
+MAX_DOT_GRAPH_DEPTH = 0
+
+DOT_TRANSPARENT = NO
+
+DOT_MULTI_TARGETS = NO
+
+GENERATE_LEGEND = YES
+
+DOT_CLEANUP = YES
openrtm-commit メーリングリストの案内