[openrtm-commit:01344] r116 - in branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip: . cmake doc idl include/Flip src
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 3月 14日 (金) 15:57:07 JST
Author: kawauchi
Date: 2014-03-14 15:57:07 +0900 (Fri, 14 Mar 2014)
New Revision: 116
Removed:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/RTC.xml20130611161610
Modified:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/README.Flip
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/RTC.xml
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/cpack_options.cmake.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/wix.xsl.in
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/doc/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/idl/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/include/Flip/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/include/Flip/Flip.h
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/src/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/src/Flip.cpp
Log:
Flip : Adjusted cmake files for the package, fixed RTC.xml, converted to the UTF-8 character code and delete unnecessary file. refs #2704
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,110 +1,122 @@
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+
+project(Flip)
+string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
+set(PROJECT_VERSION 1.1.0 CACHE STRING "Flip version")
+DISSECT_VERSION()
+set(PROJECT_DESCRIPTION "Flip image component")
+set(PROJECT_VENDOR "AIST")
+set(PROJECT_AUTHOR "AIST")
+set(PROJECT_AUTHOR_SHORT "AIST")
+
+set(LINUX_PACKAGE_GENERATOR "DEB")
+#set(LINUX_PACKAGE_GENERATOR "RPM")
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
-project(Flip)
-string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.0.0 CACHE STRING "Flip version")
-DISSECT_VERSION()
-set(PROJECT_DESCRIPTION "Flip image component")
-set(PROJECT_VENDOR "AIST")
-set(PROJECT_AUTHOR "AIST")
-set(PROJECT_AUTHOR_SHORT "AIST")
-
-# Add an "uninstall" target
-CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
- "${PROJECT_BINARY_DIR}/uninstall_target.cmake" IMMEDIATE @ONLY)
+# Add an "uninstall" target
+CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
+ "${PROJECT_BINARY_DIR}/uninstall_target.cmake" IMMEDIATE @ONLY)
ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
- "${PROJECT_BINARY_DIR}/uninstall_target.cmake")
+ "${PROJECT_BINARY_DIR}/uninstall_target.cmake")
+
+#option(BUILD_EXAMPLES "Build and install examples" OFF)
+option(BUILD_DOCUMENTATION "Build the documentation" OFF)
+#option(BUILD_TESTS "Build the tests" OFF)
+#option(BUILD_TOOLS "Build the tools" OFF)
+option(BUILD_IDL "Build and install idl" ON)
+option(BUILD_SOURCES "Build and install sources" OFF)
+
+option(STATIC_LIBS "Build static libraries" OFF)
+if(STATIC_LIBS)
+ set(LIB_TYPE STATIC)
+else(STATIC_LIBS)
+ set(LIB_TYPE SHARED)
+endif(STATIC_LIBS)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ # Mac OS X specific code
+ SET(CMAKE_CXX_COMPILER "g++")
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
+
+# Set up installation directories
+if(WIN32)
+# set(BIN_INSTALL_DIR "components/bin")
+# set(LIB_INSTALL_DIR "components/lib")
+ set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
+else(WIN32)
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
+endif(WIN32)
-#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" ON)
-#option(BUILD_TESTS "Build the tests" OFF)
-#option(BUILD_TOOLS "Build the tools" OFF)
-option(BUILD_IDL "Build and install idl" ON)
-option(BUILD_SOURCES "Build and install sources" OFF)
-
-option(STATIC_LIBS "Build static libraries" OFF)
-if(STATIC_LIBS)
- set(LIB_TYPE STATIC)
-else(STATIC_LIBS)
- set(LIB_TYPE SHARED)
-endif(STATIC_LIBS)
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- # Mac OS X specific code
- SET(CMAKE_CXX_COMPILER "g++")
-endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
-
-# Set up installation directories
-set(BIN_INSTALL_DIR "components/bin")
-set(LIB_INSTALL_DIR "components/lib")
-set(INC_INSTALL_DIR
- "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-set(SHARE_INSTALL_DIR
- "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-
-# Get necessary dependency information
-find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
-
-# Universal settings
-#enable_testing()
-
-# Subdirectories
-add_subdirectory(cmake)
-if(BUILD_DOCUMENTATION)
- add_subdirectory(doc)
-endif(BUILD_DOCUMENTATION)
-
-#if(BUILD_EXAMPLES)
-# add_subdirectory(examples)
-#endif(BUILD_EXAMPLES)
-
-if(BUILD_IDL)
- add_subdirectory(idl)
-endif(BUILD_IDL)
-
-add_subdirectory(include)
-MAP_ADD_STR(headers "include/" comp_hdrs)
-add_subdirectory(src)
-
-#if(BUILD_TESTS)
-# add_subdirectory(test)
-#endif(BUILD_TESTS)
-
-#if(BUILD_TOOLS)
-# add_subdirectory(tools)
-#endif(BUILD_TOOLS)
-
-if(BUILD_SOURCES)
- add_subdirectory(include)
- add_subdirectory(src)
-endif(BUILD_SOURCES)
-
-# Package creation
-# By default, do not warn when built on machines using only VS Express:
-IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
-SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
-ENDIF()
-include(InstallRequiredSystemLibraries)
-set(PROJECT_EXECUTABLES ${PROJECT_NAME_LOWER}Comp
- "${PROJECT_NAME_LOWER}Comp")
-
-set(cpack_options "${PROJECT_BINARY_DIR}/cpack_options.cmake")
-
-configure_file("${PROJECT_SOURCE_DIR}/cmake/cpack_options.cmake.in"
- ${cpack_options} @ONLY)
-
-set(CPACK_PROJECT_CONFIG_FILE ${cpack_options})
-include(${CPACK_PROJECT_CONFIG_FILE})
-include(CPack)
-
-
+#set(INC_INSTALL_DIR
+# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+#set(SHARE_INSTALL_DIR
+# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+
+# Get necessary dependency information
+find_package(OpenRTM)
+if(${OpenRTM_FOUND})
+ MESSAGE(STATUS "OpenRTM configuration Found")
+else(${OpenRTM_FOUND})
+ message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
+ find_package(OpenRTM REQUIRED)
+endif(${OpenRTM_FOUND})
+
+# Universal settings
+#enable_testing()
+
+# Subdirectories
+add_subdirectory(cmake)
+if(BUILD_DOCUMENTATION)
+ add_subdirectory(doc)
+endif(BUILD_DOCUMENTATION)
+
+#if(BUILD_EXAMPLES)
+# add_subdirectory(examples)
+#endif(BUILD_EXAMPLES)
+
+if(BUILD_IDL)
+ add_subdirectory(idl)
+endif(BUILD_IDL)
+
+add_subdirectory(include)
+MAP_ADD_STR(headers "include/" comp_hdrs)
+add_subdirectory(src)
+
+#if(BUILD_TESTS)
+# add_subdirectory(test)
+#endif(BUILD_TESTS)
+
+#if(BUILD_TOOLS)
+# add_subdirectory(tools)
+#endif(BUILD_TOOLS)
+
+if(BUILD_SOURCES)
+ add_subdirectory(include)
+ add_subdirectory(src)
+endif(BUILD_SOURCES)
+
+# Package creation
+# By default, do not warn when built on machines using only VS Express:
+IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
+SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+ENDIF()
+include(InstallRequiredSystemLibraries)
+set(PROJECT_EXECUTABLES ${PROJECT_NAME_LOWER}Comp
+ "${PROJECT_NAME_LOWER}Comp")
+
+set(cpack_options "${PROJECT_BINARY_DIR}/cpack_options.cmake")
+
+configure_file("${PROJECT_SOURCE_DIR}/cmake/cpack_options.cmake.in"
+ ${cpack_options} @ONLY)
+
+set(CPACK_PROJECT_CONFIG_FILE ${cpack_options})
+include(${CPACK_PROJECT_CONFIG_FILE})
+include(CPack)
+
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/README.Flip
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/README.Flip 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/README.Flip 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,144 +1,144 @@
-======================================================================
- RTComponent: Flip specificatioin
-
- OpenRTM-aist-1.0.0
- Date: $Date$
-
- This file is generated by rtc-template with the following argments.
-
-# rtc-template -bcxx --module-name=Flip
-# --module-desc='Flip image component' --module-version=1.0.0 --module-vendor=AIST
-# --module-category=Category --module-comp-type=STATIC
-# --module-act-type=PERIODIC --module-max-inst=1
-# --config=flip_mode:int:1
-# --inport=original_image:RTC::CameraImage --outport=fliped_image:RTC::CameraImage
-
-
-======================================================================
- Basic Information
-======================================================================
-# <rtc-template block="module">
-Module Name: Flip
-Description: Flip image component
-Version: 1.0.0
-Vendor: AIST
-Category: Category
-Kind: DataFlowComponent
-Comp. Type: STATIC
-Act. Type: PERIODIC
-MAX Inst.: 1
-Lang: C++
-Lang Type:
-
-# </rtc-template>
-
-
-======================================================================
- Activity definition
-======================================================================
-
-[on_initialize] implemented
-
-[on_finalize]
-
-[on_startup]
-
-[on_shutdown]
-
-[on_activated] implemented
-
-[on_deactivated] implemented
-
-[on_execute] implemented
-
-[on_aborting]
-
-[on_error]
-
-[on_reset]
-
-[on_state_update]
-
-[on_rate_changed]
-
-======================================================================
- InPorts definition
-======================================================================
-# <rtc-template block="inport">
-
- Name: original_image
- PortNumber: 0
- Description:
- PortType:
- DataType: RTC::CameraImage
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
-
-# </rtc-template>
-
-======================================================================
- OutPorts definition
-======================================================================
-# <rtc-template block="outport">
-
- Name: fliped_image
- PortNumber: 0
- Description:
- PortType:
- DataType: RTC::CameraImage
- MaxOut:
- [Data Elements]
- Name:
- Type:
- Number:
- Semantics:
- Unit:
- Frequency:
- Operation Cycle:
- RangeLow:
- RangeHigh:
- DefaultValue:
-
-
-# </rtc-template>
-
-
-======================================================================
- Service Port definition
-======================================================================
-# <rtc-template block="serviceport">
-# </rtc-template>
-
-======================================================================
- Configuration definition
-======================================================================
-# <rtc-template block="configuration">
- Configuration:
- Name: flip_mode
- Description:
- Type: int
- DefaultValue: 1
- Unit:
- Range:
- Constraint:
-
-# </rtc-template>
-
-This software is developed at the National Institute of Advanced
-Industrial Science and Technology. Approval number H23PRO-????. This
-software is licensed under the Lesser General Public License. See
-COPYING.LESSER.
-
-This area is reserved for future OpenRTM.
-
+======================================================================
+ RTComponent: Flip specificatioin
+
+ OpenRTM-aist-1.0.0
+ Date: $Date$
+
+ This file is generated by rtc-template with the following argments.
+
+# rtc-template -bcxx --module-name=Flip
+# --module-desc='Flip image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-category=Category --module-comp-type=STATIC
+# --module-act-type=PERIODIC --module-max-inst=1
+# --config=flip_mode:int:1
+# --inport=original_image:RTC::CameraImage --outport=fliped_image:RTC::CameraImage
+
+
+======================================================================
+ Basic Information
+======================================================================
+# <rtc-template block="module">
+Module Name: Flip
+Description: Flip image component
+Version: 1.1.0
+Vendor: AIST
+Category: Category
+Kind: DataFlowComponent
+Comp. Type: STATIC
+Act. Type: PERIODIC
+MAX Inst.: 1
+Lang: C++
+Lang Type:
+
+# </rtc-template>
+
+
+======================================================================
+ Activity definition
+======================================================================
+
+[on_initialize] implemented
+
+[on_finalize]
+
+[on_startup]
+
+[on_shutdown]
+
+[on_activated] implemented
+
+[on_deactivated] implemented
+
+[on_execute] implemented
+
+[on_aborting]
+
+[on_error]
+
+[on_reset]
+
+[on_state_update]
+
+[on_rate_changed]
+
+======================================================================
+ InPorts definition
+======================================================================
+# <rtc-template block="inport">
+
+ Name: original_image
+ PortNumber: 0
+ Description:
+ PortType:
+ DataType: RTC::CameraImage
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+
+# </rtc-template>
+
+======================================================================
+ OutPorts definition
+======================================================================
+# <rtc-template block="outport">
+
+ Name: fliped_image
+ PortNumber: 0
+ Description:
+ PortType:
+ DataType: RTC::CameraImage
+ MaxOut:
+ [Data Elements]
+ Name:
+ Type:
+ Number:
+ Semantics:
+ Unit:
+ Frequency:
+ Operation Cycle:
+ RangeLow:
+ RangeHigh:
+ DefaultValue:
+
+
+# </rtc-template>
+
+
+======================================================================
+ Service Port definition
+======================================================================
+# <rtc-template block="serviceport">
+# </rtc-template>
+
+======================================================================
+ Configuration definition
+======================================================================
+# <rtc-template block="configuration">
+ Configuration:
+ Name: flip_mode
+ Description:
+ Type: int
+ DefaultValue: 1
+ Unit:
+ Range:
+ Constraint:
+
+# </rtc-template>
+
+This software is developed at the National Institute of Advanced
+Industrial Science and Technology. Approval number H23PRO-????. This
+software is licensed under the Lesser General Public License. See
+COPYING.LESSER.
+
+This area is reserved for future OpenRTM.
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/RTC.xml
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/RTC.xml 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/RTC.xml 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Flip:1.0.0" xmlns:rtcExt="http://www.openrtp.org/namespaces/rtc_ext" xmlns:rtcDoc="http://www.openrtp.org/namespaces/rtc_doc" xmlns:rtc="http://www.openrtp.org/namespaces/rtc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <rtc:BasicInfo xsi:type="rtcExt:basic_info_ext" rtcExt:saveProject="Flip" rtc:updateDate="2013-06-11T16:08:28+09:00" rtc:creationDate="2013-06-11T16:08:28+09:00" rtc:version="1.0.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Flip image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Flip"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Flip:1.1.0" xmlns:rtcExt="http://www.openrtp.org/namespaces/rtc_ext" xmlns:rtc="http://www.openrtp.org/namespaces/rtc" xmlns:rtcDoc="http://www.openrtp.org/namespaces/rtc_doc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <rtc:BasicInfo xsi:type="rtcExt:basic_info_ext" rtcExt:saveProject="Flip" rtc:updateDate="2013-06-11T16:08:28+09:00" rtc:creationDate="2013-06-11T16:08:28+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Flip image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Flip"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Deleted: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/RTC.xml20130611161610
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/RTC.xml20130611161610 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/RTC.xml20130611161610 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:VenderName:Category:ModuleName:1.0.0" xmlns:rtcExt="http://www.openrtp.org/namespaces/rtc_ext" xmlns:rtcDoc="http://www.openrtp.org/namespaces/rtc_doc" xmlns:rtc="http://www.openrtp.org/namespaces/rtc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <rtc:BasicInfo xsi:type="rtcExt:basic_info_ext" rtc:updateDate="2013-06-11T16:08:28+09:00" rtc:creationDate="2013-06-11T16:08:28+09:00" rtc:version="1.0.0" rtc:vendor="VenderName" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="ModuleDescription" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ModuleName">
- <rtcDoc:Doc rtcDoc:license="" rtcDoc:creator=""/>
- </rtc:BasicInfo>
- <rtc:Actions/>
-</rtc:RtcProfile>
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/CMakeLists.txt 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/CMakeLists.txt 2014-03-14 06:57:07 UTC (rev 116)
@@ -2,8 +2,8 @@
set(PKG_LIBS -l${PROJECT_NAME_LOWER})
set(pkg_conf_file ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}.pc)
configure_file(${PROJECT_NAME_LOWER}.pc.in ${pkg_conf_file} @ONLY)
-install(FILES ${pkg_conf_file}
- DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ COMPONENT component)
+#install(FILES ${pkg_conf_file}
+# DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ COMPONENT component)
# Install CMake modules
set(cmake_config ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config.cmake)
@@ -14,5 +14,5 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake.in
${cmake_version_config} @ONLY)
set(cmake_mods ${cmake_config} ${cmake_version_config})
-install(FILES ${cmake_mods} DESTINATION ${SHARE_INSTALL_DIR} COMPONENT library)
+#install(FILES ${cmake_mods} DESTINATION ${SHARE_INSTALL_DIR} COMPONENT library)
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/cpack_options.cmake.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/cpack_options.cmake.in 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/cpack_options.cmake.in 2014-03-14 06:57:07 UTC (rev 116)
@@ -68,9 +68,9 @@
#
#
#
- set(CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
- set(CPACK_NSIS_MUI_UNIICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
- set(CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.bmp")
+# set(CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
+# set(CPACK_NSIS_MUI_UNIICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
+# set(CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.bmp")
set(CPACK_NSIS_HELP_LINK "http://www.openrtm.org")
set(CPACK_NSIS_URL_INFO_ABOUT "http://www.openrtm.org")
set(CPACK_NSIS_MODIFY_PATH ON)
@@ -90,5 +90,9 @@
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
" Delete \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
Delete \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/wix.xsl.in
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/wix.xsl.in 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/cmake/wix.xsl.in 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
- <xsl:output indent="yes" method="xml"/>
-
- <xsl:template match="/wix:Wix">
- <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product xmlns="http://schemas.microsoft.com/wix/2006/wi" Id="7E54000C-5342-4C6F-8AC8-FDFFA092D43F" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="556307E9-B67E-4053-93E7-A53F3CB783FE">
- <Package InstallerVersion="300" Compressed="yes" Languages='1041' SummaryCodepage='932' />
- <Media Id="1" Cabinet="@CPACK_PACKAGE_NAME at .cab" EmbedCab="yes" />
- <Directory Id="TARGETDIR" Name="SourceDir" >
- <Directory Id="ProgramFilesFolder" Name="PFILE" >
- <Directory Id="OPENRTM_DIR" Name="OpenRTM-aist" >
- <!-- <Directory Id="INSTALLLOCATION" Name="@OPENRTM_VERSION_MAJOR at .@OPENRTM_VERSION_MINOR@" /> -->
- <Directory Id="INSTALLLOCATION" Name="1.1" />
- </Directory>
- </Directory>
- </Directory>
-
- <Feature Id="APPLICATIONS" Title="@CPACK_COMPONENT_COMPONENT_DISPLAY_NAME@" Level="1" Description="@CPACK_COMPONENT_COMPONENT_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <!--
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .dll')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .lib')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at Comp.exe')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\RTC.xml')]" />
- -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at .dll','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\lib\@CPACK_PACKAGE_NAME at .lib','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at Comp.exe','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, 'RTC.xml')]" />
- </Feature>
-
- <Feature Id="DOCUMENTS" Title="@CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\doc')]" />
- </Feature>
-
- <!-- <Feature Id="SOURCES" Title="@CPACK_COMPONENT_SOURCES_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_SOURCES_DESCRIPTION@" >-->
- <!-- Start Ripping through the xml -->
- <!-- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@CPACK_PACKAGE_INSTALL_DIRECTORY@\src')]" /> -->
- <!-- </Feature> -->
-
- <!--Tack on your specific wix options-->
- <UIRef Id="WixUI_FeatureTree" />
- <UIRef Id="WixUI_ErrorProgressText" />
- <!--
- <WixVariable Id="WixUILicenseRtf" Value="@CPACK_RESOURCE_FILE_LICENSE@"/>
- -->
- <!-- TODO: Add Wix Specific Dialogs and features. -->
- <!-- TODO: Add artwork -->
- <!-- TODO: Add ... -->
-
- </Product>
-
- <!--Output the fragment info which heat generates-->
- <xsl:copy-of select="wix:Fragment[wix:DirectoryRef/wix:Component]" />
- <xsl:apply-templates select="wix:Fragment[wix:DirectoryRef/@Id!='TARGETDIR' and wix:DirectoryRef/wix:Directory]" />
-
- </Wix>
- </xsl:template>
-
- <xsl:template match="wix:Fragment[wix:DirectoryRef/wix:Directory]" >
- <xsl:copy>
- <xsl:apply-templates select="wix:DirectoryRef" />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:DirectoryRef" >
- <xsl:copy>
- <xsl:choose>
- <xsl:when test="wix:Directory[@Name='components']" >
- <xsl:attribute name="Id">INSTALLLOCATION</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:apply-templates />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Directory" >
- <xsl:copy>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- <xsl:attribute name="Name"><xsl:value-of select="@Name" /></xsl:attribute>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Component">
- <xsl:element name="ComponentRef" xmlns="http://schemas.microsoft.com/wix/2006/wi" >
- <xsl:attribute name="Id">
- <xsl:value-of select="@Id" />
- </xsl:attribute>
- </xsl:element>
- </xsl:template>
-
-</xsl:stylesheet>
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
+ <xsl:output indent="yes" method="xml"/>
+
+ <xsl:template match="/wix:Wix">
+ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Product xmlns="http://schemas.microsoft.com/wix/2006/wi" Id="008C879D-8030-4411-BC31-AEFF620EAABA" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="16ACF181-AF2E-4996-808A-7B8266C733D3">
+ <Package InstallerVersion="300" Compressed="yes" Languages='1041' SummaryCodepage='932' />
+ <Media Id="1" Cabinet="@CPACK_PACKAGE_NAME at .cab" EmbedCab="yes" />
+ <Directory Id="TARGETDIR" Name="SourceDir" >
+ <Directory Id="ProgramFilesFolder" Name="PFILE" >
+ <Directory Id="OPENRTM_DIR" Name="OpenRTM-aist" >
+ <!-- <Directory Id="INSTALLLOCATION" Name="@OPENRTM_VERSION_MAJOR at .@OPENRTM_VERSION_MINOR@" /> -->
+ <Directory Id="INSTALLLOCATION" Name="1.1" />
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <Feature Id="APPLICATIONS" Title="@CPACK_COMPONENT_COMPONENT_DISPLAY_NAME@" Level="1" Description="@CPACK_COMPONENT_COMPONENT_DESCRIPTION@" >
+ <!-- Start Ripping through the xml -->
+ <!--
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .dll')]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .lib')]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at Comp.exe')]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\RTC.xml')]" />
+ -->
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at .dll','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\lib\@CPACK_PACKAGE_NAME at .lib','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at Comp.exe','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, 'RTC.xml')]" />
+ </Feature>
+
+ <Feature Id="DOCUMENTS" Title="@CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION@" >
+ <!-- Start Ripping through the xml -->
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\doc')]" />
+ </Feature>
+
+ <!-- <Feature Id="SOURCES" Title="@CPACK_COMPONENT_SOURCES_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_SOURCES_DESCRIPTION@" >-->
+ <!-- Start Ripping through the xml -->
+ <!-- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@CPACK_PACKAGE_INSTALL_DIRECTORY@\src')]" /> -->
+ <!-- </Feature> -->
+
+ <!--Tack on your specific wix options-->
+ <UIRef Id="WixUI_FeatureTree" />
+ <UIRef Id="WixUI_ErrorProgressText" />
+ <!--
+ <WixVariable Id="WixUILicenseRtf" Value="@CPACK_RESOURCE_FILE_LICENSE@"/>
+ -->
+ <!-- TODO: Add Wix Specific Dialogs and features. -->
+ <!-- TODO: Add artwork -->
+ <!-- TODO: Add ... -->
+
+ </Product>
+
+ <!--Output the fragment info which heat generates-->
+ <xsl:copy-of select="wix:Fragment[wix:DirectoryRef/wix:Component]" />
+ <xsl:apply-templates select="wix:Fragment[wix:DirectoryRef/@Id!='TARGETDIR' and wix:DirectoryRef/wix:Directory]" />
+
+ </Wix>
+ </xsl:template>
+
+ <xsl:template match="wix:Fragment[wix:DirectoryRef/wix:Directory]" >
+ <xsl:copy>
+ <xsl:apply-templates select="wix:DirectoryRef" />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="wix:DirectoryRef" >
+ <xsl:copy>
+ <xsl:choose>
+ <xsl:when test="wix:Directory[@Name='components']" >
+ <xsl:attribute name="Id">INSTALLLOCATION</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:apply-templates />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="wix:Directory" >
+ <xsl:copy>
+ <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
+ <xsl:attribute name="Name"><xsl:value-of select="@Name" /></xsl:attribute>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="wix:Component">
+ <xsl:element name="ComponentRef" xmlns="http://schemas.microsoft.com/wix/2006/wi" >
+ <xsl:attribute name="Id">
+ <xsl:value-of select="@Id" />
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:template>
+
+</xsl:stylesheet>
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/doc/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/doc/CMakeLists.txt 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/doc/CMakeLists.txt 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,40 +1,40 @@
cmake_policy(SET CMP0002 OLD)
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
- # Search for Sphinx
- #set(SPHINX_PATH "" CACHE PATH
- # "Path to the directory containing the sphinx-build program")
- #find_program(SPHINX_BUILD sphinx-build PATHS ${SPHINX_PATH})
- #if(NOT SPHINX_BUILD)
- # message(FATAL_ERROR
- # "Sphinx was not found. Set SPHINX_PATH to the directory containing the sphinx-build executable, or disable BUILD_DOCUMENTATION.")
- #endif(NOT SPHINX_BUILD)
-
- set(html_dir "${CMAKE_CURRENT_BINARY_DIR}/html")
- set(doxygen_dir "${html_dir}/doxygen")
- file(MAKE_DIRECTORY ${html_dir})
- file(MAKE_DIRECTORY ${doxygen_dir})
-
- # Doxygen part
- set(doxyfile "${CMAKE_CURRENT_BINARY_DIR}/doxyfile")
- configure_file(doxyfile.in ${doxyfile})
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+ # Search for Sphinx
+ #set(SPHINX_PATH "" CACHE PATH
+ # "Path to the directory containing the sphinx-build program")
+ #find_program(SPHINX_BUILD sphinx-build PATHS ${SPHINX_PATH})
+ #if(NOT SPHINX_BUILD)
+ # message(FATAL_ERROR
+ # "Sphinx was not found. Set SPHINX_PATH to the directory containing the sphinx-build executable, or disable BUILD_DOCUMENTATION.")
+ #endif(NOT SPHINX_BUILD)
+
+ set(html_dir "${CMAKE_CURRENT_BINARY_DIR}/html")
+ set(doxygen_dir "${html_dir}/doxygen")
+ file(MAKE_DIRECTORY ${html_dir})
+ file(MAKE_DIRECTORY ${doxygen_dir})
+
+ # Doxygen part
+ set(doxyfile "${CMAKE_CURRENT_BINARY_DIR}/doxyfile")
+ configure_file(doxyfile.in ${doxyfile})
add_custom_target(${PROJECT_NAME}_doxygen_doc ${DOXYGEN_EXECUTABLE} ${doxyfile})
-
- # Sphinx part
- #set(conf_dir "${CMAKE_CURRENT_BINARY_DIR}/conf")
- #file(MAKE_DIRECTORY "${conf_dir}")
- #file(MAKE_DIRECTORY "${conf_dir}/_static")
- #set(conf_py "${conf_dir}/conf.py")
- #configure_file(conf.py.in ${conf_py})
- #add_custom_target(sphinx_doc ALL sphinx-build -b html -c ${conf_dir}
- # ${CMAKE_CURRENT_SOURCE_DIR}/content ${CMAKE_CURRENT_BINARY_DIR}/html
- # DEPENDS doxygen_doc)
- #install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html" DESTINATION
- # "components/share/doc/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}"
- # COMPONENT documentation)
-else(DOXYGEN_FOUND)
- message(FATAL_ERROR
- "Doxygen was not found. Cannot build documentation. Disable BUILD_DOCUMENTATION to continue")
-endif(DOXYGEN_FOUND)
-
+
+ # Sphinx part
+ #set(conf_dir "${CMAKE_CURRENT_BINARY_DIR}/conf")
+ #file(MAKE_DIRECTORY "${conf_dir}")
+ #file(MAKE_DIRECTORY "${conf_dir}/_static")
+ #set(conf_py "${conf_dir}/conf.py")
+ #configure_file(conf.py.in ${conf_py})
+ #add_custom_target(sphinx_doc ALL sphinx-build -b html -c ${conf_dir}
+ # ${CMAKE_CURRENT_SOURCE_DIR}/content ${CMAKE_CURRENT_BINARY_DIR}/html
+ # DEPENDS doxygen_doc)
+ #install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html" DESTINATION
+ # "components/share/doc/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}"
+ # COMPONENT documentation)
+else(DOXYGEN_FOUND)
+ message(FATAL_ERROR
+ "Doxygen was not found. Cannot build documentation. Disable BUILD_DOCUMENTATION to continue")
+endif(DOXYGEN_FOUND)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/idl/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/idl/CMakeLists.txt 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/idl/CMakeLists.txt 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,56 +1,56 @@
-set(idls )
-
-install(FILES ${idls} DESTINATION ${INC_INSTALL_DIR}/idl
- COMPONENT idl)
-
-macro(_IDL_OUTPUTS _idl _dir _result)
- set(${_result} ${_dir}/${_idl}SK.cc ${_dir}/${_idl}.hh
- ${_dir}/${_idl}DynSK.cc)
-endmacro(_IDL_OUTPUTS)
-
-macro(_COMPILE_IDL _idl_file)
- if(NOT WIN32)
- execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE OPENRTM_DIR
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDLFLAGS
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- separate_arguments(OPENRTM_IDLFLAGS)
- execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDLC
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- set(_rtm_skelwrapper_command "rtm-skelwrapper")
- else(NOT WIN32)
- set(_rtm_skelwrapper_command "rtm-skelwrapper.py")
- endif(NOT WIN32)
- get_filename_component(_idl ${_idl_file} NAME_WE)
- set(_idl_srcs_var ${_idl}_SRCS)
- _IDL_OUTPUTS(${_idl} ${CMAKE_CURRENT_BINARY_DIR} ${_idl_srcs_var})
-
- add_custom_command(OUTPUT ${${_idl_srcs_var}}
- COMMAND python ${OPENRTM_DIR}/bin/${_rtm_skelwrapper_command} --include-dir= --skel-suffix=Skel --stub-suffix=Stub --idl-file=${_idl}.idl
- COMMAND ${OPENRTM_IDLC} ${OPENRTM_IDLFLAGS} ${_idl_file}
- WORKING_DIRECTORY ${CURRENT_BINARY_DIR}
- DEPENDS ${_idl_file}
- COMMENT "Compiling ${_idl_file}" VERBATIM)
- add_custom_target(${_idl}_TGT DEPENDS ${${_idl_srcs_var}})
- set(ALL_IDL_SRCS ${ALL_IDL_SRCS} ${${_idl_srcs_var}})
- if(NOT TARGET ALL_IDL_TGT)
- add_custom_target(ALL_IDL_TGT)
- endif(NOT TARGET ALL_IDL_TGT)
- add_dependencies(ALL_IDL_TGT ${_idl}_TGT)
-endmacro(_COMPILE_IDL)
-
-# Module exposed to the user
-macro(OPENRTM_COMPILE_IDL_FILES)
- foreach(idl ${ARGN})
- _COMPILE_IDL(${idl})
- endforeach(idl)
-endmacro(OPENRTM_COMPILE_IDL_FILES)
-
-
-OPENRTM_COMPILE_IDL_FILES(${idls})
-set(ALL_IDL_SRCS ${ALL_IDL_SRCS} PARENT_SCOPE)
+set(idls )
+
+#install(FILES ${idls} DESTINATION ${INC_INSTALL_DIR}/idl
+# COMPONENT idl)
+
+macro(_IDL_OUTPUTS _idl _dir _result)
+ set(${_result} ${_dir}/${_idl}SK.cc ${_dir}/${_idl}.hh
+ ${_dir}/${_idl}DynSK.cc)
+endmacro(_IDL_OUTPUTS)
+
+macro(_COMPILE_IDL _idl_file)
+ if(NOT WIN32)
+ execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE OPENRTM_DIR
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDLFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ separate_arguments(OPENRTM_IDLFLAGS)
+ execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDLC
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(_rtm_skelwrapper_command "rtm-skelwrapper")
+ else(NOT WIN32)
+ set(_rtm_skelwrapper_command "rtm-skelwrapper.py")
+ endif(NOT WIN32)
+ get_filename_component(_idl ${_idl_file} NAME_WE)
+ set(_idl_srcs_var ${_idl}_SRCS)
+ _IDL_OUTPUTS(${_idl} ${CMAKE_CURRENT_BINARY_DIR} ${_idl_srcs_var})
+
+ add_custom_command(OUTPUT ${${_idl_srcs_var}}
+ COMMAND python ${OPENRTM_DIR}/bin/${_rtm_skelwrapper_command} --include-dir= --skel-suffix=Skel --stub-suffix=Stub --idl-file=${_idl}.idl
+ COMMAND ${OPENRTM_IDLC} ${OPENRTM_IDLFLAGS} ${_idl_file}
+ WORKING_DIRECTORY ${CURRENT_BINARY_DIR}
+ DEPENDS ${_idl_file}
+ COMMENT "Compiling ${_idl_file}" VERBATIM)
+ add_custom_target(${_idl}_TGT DEPENDS ${${_idl_srcs_var}})
+ set(ALL_IDL_SRCS ${ALL_IDL_SRCS} ${${_idl_srcs_var}})
+ if(NOT TARGET ALL_IDL_TGT)
+ add_custom_target(ALL_IDL_TGT)
+ endif(NOT TARGET ALL_IDL_TGT)
+ add_dependencies(ALL_IDL_TGT ${_idl}_TGT)
+endmacro(_COMPILE_IDL)
+
+# Module exposed to the user
+macro(OPENRTM_COMPILE_IDL_FILES)
+ foreach(idl ${ARGN})
+ _COMPILE_IDL(${idl})
+ endforeach(idl)
+endmacro(OPENRTM_COMPILE_IDL_FILES)
+
+
+OPENRTM_COMPILE_IDL_FILES(${idls})
+set(ALL_IDL_SRCS ${ALL_IDL_SRCS} PARENT_SCOPE)
FILTER_LIST("${ALL_IDL_SRCS}" "hh$" idl_headers)
-install(FILES ${idl_headers}
- DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}/idl
- COMPONENT headers)
-
+#install(FILES ${idl_headers}
+# DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}/idl
+# COMPONENT headers)
+
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/include/Flip/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/include/Flip/CMakeLists.txt 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/include/Flip/CMakeLists.txt 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,7 +1,7 @@
set(hdrs Flip.h
- PARENT_SCOPE
+# PARENT_SCOPE
)
-install(FILES ${hdrs} DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}
- COMPONENT library)
+#install(FILES ${hdrs} DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}
+# COMPONENT library)
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/include/Flip/Flip.h
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/include/Flip/Flip.h 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/include/Flip/Flip.h 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,293 +1,293 @@
-// -*- C++ -*-
-/*!
- * @file Flip.h
- * @brief Flip image component
- * @date $Date$
- *
- * $Id$
- */
-
-#ifndef FLIP_H
-#define FLIP_H
-
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
-#include <rtm/idl/BasicDataTypeSkel.h>
-#include <rtm/idl/ExtendedDataTypesSkel.h>
-#include <rtm/idl/InterfaceDataTypesSkel.h>
-
-
-//OpenCV—pƒCƒ“ƒNƒ‹[ƒhƒtƒ@ƒCƒ‹‚̃Cƒ“ƒNƒ‹[ƒh
-#include <cv.h>
-#include <cxcore.h>
-#include <highgui.h>
-
-// Service implementation headers
-// <rtc-template block="service_impl_h">
-
-// </rtc-template>
-
-// Service Consumer stub headers
-// <rtc-template block="consumer_stub_h">
-
-// </rtc-template>
-
-using namespace RTC;
-
-/*!
- * @class Flip
- * @brief Flip image component
- *
- */
-class Flip
- : public RTC::DataFlowComponentBase
-{
- public:
- /*!
- * @brief constructor
- * @param manager Maneger Object
- */
- Flip(RTC::Manager* manager);
-
- /*!
- * @brief destructor
- */
- ~Flip();
-
- // <rtc-template block="public_attribute">
-
- // </rtc-template>
-
- // <rtc-template block="public_operation">
-
- // </rtc-template>
-
- /***
- *
- * The initialize action (on CREATED->ALIVE transition)
- * formaer rtc_init_entry()
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- virtual RTC::ReturnCode_t onInitialize();
-
- /***
- *
- * The finalize action (on ALIVE->END transition)
- * formaer rtc_exiting_entry()
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onFinalize();
-
- /***
- *
- * The startup action when ExecutionContext startup
- * former rtc_starting_entry()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onStartup(RTC::UniqueId ec_id);
-
- /***
- *
- * The shutdown action when ExecutionContext stop
- * former rtc_stopping_entry()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onShutdown(RTC::UniqueId ec_id);
-
- /***
- *
- * The activated action (Active state entry action)
- * former rtc_active_entry()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- virtual RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id);
-
- /***
- *
- * The deactivated action (Active state exit action)
- * former rtc_active_exit()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- virtual RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id);
-
- /***
- *
- * The execution action that is invoked periodically
- * former rtc_active_do()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- virtual RTC::ReturnCode_t onExecute(RTC::UniqueId ec_id);
-
- /***
- *
- * The aborting action when main logic error occurred.
- * former rtc_aborting_entry()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onAborting(RTC::UniqueId ec_id);
-
- /***
- *
- * The error action in ERROR state
- * former rtc_error_do()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onError(RTC::UniqueId ec_id);
-
- /***
- *
- * The reset action that is invoked resetting
- * This is same but different the former rtc_init_entry()
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
-
- /***
- *
- * The state update action that is invoked after onExecute() action
- * no corresponding operation exists in OpenRTm-aist-0.2.0
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
-
- /***
- *
- * The action that is invoked when execution context's rate is changed
- * no corresponding operation exists in OpenRTm-aist-0.2.0
- *
- * @param ec_id target ExecutionContext Id
- *
- * @return RTC::ReturnCode_t
- *
- *
- */
- // virtual RTC::ReturnCode_t onRateChanged(RTC::UniqueId ec_id);
-
-
- protected:
- // <rtc-template block="protected_attribute">
-
- // </rtc-template>
-
- // <rtc-template block="protected_operation">
-
- // </rtc-template>
-
- // Configuration variable declaration
- // <rtc-template block="config_declare">
- /*!
- *
- * - Name: flip_mode
- * - DefaultValue: 1
- */
- int m_flip_mode;
-
- // </rtc-template>
-
- // DataInPort declaration
- // <rtc-template block="inport_declare">
- RTC::CameraImage m_image_orig;
- /*!
- */
- InPort<RTC::CameraImage> m_image_origIn;
-
- // </rtc-template>
-
-
- // DataOutPort declaration
- // <rtc-template block="outport_declare">
- RTC::CameraImage m_image_flip;
- /*!
- */
- OutPort<RTC::CameraImage> m_image_flipOut;
-
- // </rtc-template>
-
- // CORBA Port declaration
- // <rtc-template block="corbaport_declare">
-
- // </rtc-template>
-
- // Service declaration
- // <rtc-template block="service_declare">
-
- // </rtc-template>
-
- // Consumer declaration
- // <rtc-template block="consumer_declare">
-
- // </rtc-template>
-
- private:
- // <rtc-template block="private_attribute">
-
- // </rtc-template>
-
- // <rtc-template block="private_operation">
-
- // </rtc-template>
- IplImage* m_image_buff;
- IplImage* m_flip_image_buff;
-};
-
-
-extern "C"
-{
- DLL_EXPORT void FlipInit(RTC::Manager* manager);
-};
-
-#endif // FLIP_H
+// -*- C++ -*-
+/*!
+ * @file Flip.h
+ * @brief Flip image component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#ifndef FLIP_H
+#define FLIP_H
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+#include <rtm/idl/BasicDataTypeSkel.h>
+#include <rtm/idl/ExtendedDataTypesSkel.h>
+#include <rtm/idl/InterfaceDataTypesSkel.h>
+
+
+/* OpenCV用インクルードファイルã®ã‚¤ãƒ³ã‚¯ãƒ«ãƒ¼ãƒ‰ */
+#include <cv.h>
+#include <cxcore.h>
+#include <highgui.h>
+
+// Service implementation headers
+// <rtc-template block="service_impl_h">
+
+// </rtc-template>
+
+// Service Consumer stub headers
+// <rtc-template block="consumer_stub_h">
+
+// </rtc-template>
+
+using namespace RTC;
+
+/*!
+ * @class Flip
+ * @brief Flip image component
+ *
+ */
+class Flip
+ : public RTC::DataFlowComponentBase
+{
+ public:
+ /*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+ Flip(RTC::Manager* manager);
+
+ /*!
+ * @brief destructor
+ */
+ ~Flip();
+
+ // <rtc-template block="public_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="public_operation">
+
+ // </rtc-template>
+
+ /***
+ *
+ * The initialize action (on CREATED->ALIVE transition)
+ * formaer rtc_init_entry()
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ virtual RTC::ReturnCode_t onInitialize();
+
+ /***
+ *
+ * The finalize action (on ALIVE->END transition)
+ * formaer rtc_exiting_entry()
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onFinalize();
+
+ /***
+ *
+ * The startup action when ExecutionContext startup
+ * former rtc_starting_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onStartup(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The shutdown action when ExecutionContext stop
+ * former rtc_stopping_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onShutdown(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The activated action (Active state entry action)
+ * former rtc_active_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ virtual RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The deactivated action (Active state exit action)
+ * former rtc_active_exit()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ virtual RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The execution action that is invoked periodically
+ * former rtc_active_do()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ virtual RTC::ReturnCode_t onExecute(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The aborting action when main logic error occurred.
+ * former rtc_aborting_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onAborting(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The error action in ERROR state
+ * former rtc_error_do()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onError(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The reset action that is invoked resetting
+ * This is same but different the former rtc_init_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The state update action that is invoked after onExecute() action
+ * no corresponding operation exists in OpenRTm-aist-0.2.0
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The action that is invoked when execution context's rate is changed
+ * no corresponding operation exists in OpenRTm-aist-0.2.0
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onRateChanged(RTC::UniqueId ec_id);
+
+
+ protected:
+ // <rtc-template block="protected_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="protected_operation">
+
+ // </rtc-template>
+
+ // Configuration variable declaration
+ // <rtc-template block="config_declare">
+ /*!
+ *
+ * - Name: flip_mode
+ * - DefaultValue: 1
+ */
+ int m_flip_mode;
+
+ // </rtc-template>
+
+ // DataInPort declaration
+ // <rtc-template block="inport_declare">
+ RTC::CameraImage m_image_orig;
+ /*!
+ */
+ InPort<RTC::CameraImage> m_image_origIn;
+
+ // </rtc-template>
+
+
+ // DataOutPort declaration
+ // <rtc-template block="outport_declare">
+ RTC::CameraImage m_image_flip;
+ /*!
+ */
+ OutPort<RTC::CameraImage> m_image_flipOut;
+
+ // </rtc-template>
+
+ // CORBA Port declaration
+ // <rtc-template block="corbaport_declare">
+
+ // </rtc-template>
+
+ // Service declaration
+ // <rtc-template block="service_declare">
+
+ // </rtc-template>
+
+ // Consumer declaration
+ // <rtc-template block="consumer_declare">
+
+ // </rtc-template>
+
+ private:
+ // <rtc-template block="private_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="private_operation">
+
+ // </rtc-template>
+ IplImage* m_image_buff;
+ IplImage* m_flip_image_buff;
+};
+
+
+extern "C"
+{
+ DLL_EXPORT void FlipInit(RTC::Manager* manager);
+};
+
+#endif // FLIP_H
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/src/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/src/CMakeLists.txt 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/src/CMakeLists.txt 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,63 +1,69 @@
-set(comp_srcs Flip.cpp )
-set(standalone_srcs FlipComp.cpp)
-
+set(comp_srcs Flip.cpp )
+set(standalone_srcs FlipComp.cpp)
+
find_package(OpenCV REQUIRED)
-if (DEFINED OPENRTM_INCLUDE_DIRS)
- string(REGEX REPLACE "-I" ";"
- OPENRTM_INCLUDE_DIRS "${OPENRTM_INCLUDE_DIRS}")
- string(REGEX REPLACE " ;" ";"
- OPENRTM_INCLUDE_DIRS "${OPENRTM_INCLUDE_DIRS}")
-endif (DEFINED OPENRTM_INCLUDE_DIRS)
-
-if (DEFINED OPENRTM_LIBRARY_DIRS)
- string(REGEX REPLACE "-L" ";"
- OPENRTM_LIBRARY_DIRS "${OPENRTM_LIBRARY_DIRS}")
- string(REGEX REPLACE " ;" ";"
- OPENRTM_LIBRARY_DIRS "${OPENRTM_LIBRARY_DIRS}")
-endif (DEFINED OPENRTM_LIBRARY_DIRS)
-
-if (DEFINED OPENRTM_LIBRARIES)
- string(REGEX REPLACE "-l" ";"
- OPENRTM_LIBRARIES "${OPENRTM_LIBRARIES}")
- string(REGEX REPLACE " ;" ";"
- OPENRTM_LIBRARIES "${OPENRTM_LIBRARIES}")
-endif (DEFINED OPENRTM_LIBRARIES)
-
-include_directories(${PROJECT_SOURCE_DIR}/include)
-include_directories(${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
-include_directories(${PROJECT_BINARY_DIR})
-include_directories(${PROJECT_BINARY_DIR}/idl)
-include_directories(${OPENRTM_INCLUDE_DIRS})
-include_directories(${OMNIORB_INCLUDE_DIRS})
-add_definitions(${OPENRTM_CFLAGS})
-add_definitions(${OMNIORB_CFLAGS})
-
-MAP_ADD_STR(comp_hdrs "../" comp_headers)
-
-link_directories(${OPENRTM_LIBRARY_DIRS})
-link_directories(${OMNIORB_LIBRARY_DIRS})
-
-add_library(${PROJECT_NAME} ${LIB_TYPE} ${comp_srcs}
- ${comp_headers} ${ALL_IDL_SRCS})
-set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-set_source_files_properties(${ALL_IDL_SRCS} PROPERTIES GENERATED 1)
-add_dependencies(${PROJECT_NAME} ALL_IDL_TGT)
+if (DEFINED OPENRTM_INCLUDE_DIRS)
+ string(REGEX REPLACE "-I" ";"
+ OPENRTM_INCLUDE_DIRS "${OPENRTM_INCLUDE_DIRS}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_INCLUDE_DIRS "${OPENRTM_INCLUDE_DIRS}")
+endif (DEFINED OPENRTM_INCLUDE_DIRS)
+
+if (DEFINED OPENRTM_LIBRARY_DIRS)
+ string(REGEX REPLACE "-L" ";"
+ OPENRTM_LIBRARY_DIRS "${OPENRTM_LIBRARY_DIRS}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_LIBRARY_DIRS "${OPENRTM_LIBRARY_DIRS}")
+endif (DEFINED OPENRTM_LIBRARY_DIRS)
+
+if (DEFINED OPENRTM_LIBRARIES)
+ string(REGEX REPLACE "-l" ";"
+ OPENRTM_LIBRARIES "${OPENRTM_LIBRARIES}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_LIBRARIES "${OPENRTM_LIBRARIES}")
+endif (DEFINED OPENRTM_LIBRARIES)
+
+include_directories(${PROJECT_SOURCE_DIR}/include)
+include_directories(${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
+include_directories(${PROJECT_BINARY_DIR})
+include_directories(${PROJECT_BINARY_DIR}/idl)
+include_directories(${OPENRTM_INCLUDE_DIRS})
+include_directories(${OMNIORB_INCLUDE_DIRS})
+add_definitions(${OPENRTM_CFLAGS})
+add_definitions(${OMNIORB_CFLAGS})
+
+MAP_ADD_STR(comp_hdrs "../" comp_headers)
+
+link_directories(${OPENRTM_LIBRARY_DIRS})
+link_directories(${OMNIORB_LIBRARY_DIRS})
+
+add_library(${PROJECT_NAME} ${LIB_TYPE} ${comp_srcs}
+ ${comp_headers} ${ALL_IDL_SRCS})
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
+set_source_files_properties(${ALL_IDL_SRCS} PROPERTIES GENERATED 1)
+add_dependencies(${PROJECT_NAME} ALL_IDL_TGT)
target_link_libraries(${PROJECT_NAME} ${OPENRTM_LIBRARIES} ${OpenCV_LIBS})
-
-add_executable(${PROJECT_NAME}Comp ${standalone_srcs}
- ${comp_srcs} ${comp_headers} ${ALL_IDL_SRCS})
+
+add_executable(${PROJECT_NAME}Comp ${standalone_srcs}
+ ${comp_srcs} ${comp_headers} ${ALL_IDL_SRCS})
target_link_libraries(${PROJECT_NAME}Comp ${OPENRTM_LIBRARIES} ${OpenCV_LIBS})
+
+#install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}Comp
+# EXPORT ${PROJECT_NAME}
+# RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT component
+# LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT component
+# ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT component)
+#install(EXPORT ${PROJECT_NAME}
+# DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}
+# FILE ${PROJECT_NAME}Depends.cmake)
+install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}Comp
+ EXPORT ${PROJECT_NAME}
+ RUNTIME DESTINATION ${INSTALL_PREFIX} COMPONENT component
+ LIBRARY DESTINATION ${INSTALL_PREFIX} COMPONENT component
+ ARCHIVE DESTINATION ${INSTALL_PREFIX} COMPONENT component)
+
-install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}Comp
- EXPORT ${PROJECT_NAME}
- RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT component
- LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT component
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT component)
-install(EXPORT ${PROJECT_NAME}
- DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}
- FILE ${PROJECT_NAME}Depends.cmake)
-
if (SolutionDir)
if (MSVC)
add_custom_command(
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/src/Flip.cpp
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/src/Flip.cpp 2014-03-13 08:35:15 UTC (rev 115)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Flip/src/Flip.cpp 2014-03-14 06:57:07 UTC (rev 116)
@@ -1,232 +1,232 @@
-// -*- C++ -*-
-/*!
- * @file Flip.cpp
- * @brief Flip image component
- * @date $Date$
- *
- * $Id$
- */
-
-#include "Flip.h"
-#include <iostream>
-using namespace std;
-
-// Module specification
-// <rtc-template block="module_spec">
-static const char* flip_spec[] =
- {
- "implementation_id", "Flip",
- "type_name", "Flip",
- "description", "Flip image component",
- "version", "1.0.0",
- "vendor", "AIST",
- "category", "Category",
- "activity_type", "PERIODIC",
- "kind", "DataFlowComponent",
- "max_instance", "1",
- "language", "C++",
- "lang_type", "compile",
- // Configuration variables
- "conf.default.flip_mode", "1",
- // Widget
- "conf.__widget__.flip_mode", "radio",
- // Constraints
- "conf.__constraints__.flip_mode", "(-1,0,1)",
- ""
- };
-// </rtc-template>
-
-/*!
- * @brief constructor
- * @param manager Maneger Object
- */
-Flip::Flip(RTC::Manager* manager)
- // <rtc-template block="initializer">
- : RTC::DataFlowComponentBase(manager),
- m_image_origIn("original_image", m_image_orig),
- m_image_flipOut("fliped_image", m_image_flip)
-
- // </rtc-template>
-{
-}
-
-/*!
- * @brief destructor
- */
-Flip::~Flip()
-{
-}
-
-
-
-RTC::ReturnCode_t Flip::onInitialize()
-{
- // Registration: InPort/OutPort/Service
- // <rtc-template block="registration">
- // Set InPort buffers
- addInPort("original_image", m_image_origIn);
-
- // Set OutPort buffer
- addOutPort("fliped_image", m_image_flipOut);
-
- // Set service provider to Ports
-
- // Set service consumers to Ports
-
- // Set CORBA Service Ports
-
- // </rtc-template>
-
- // <rtc-template block="bind_config">
- // Bind variables and configuration variable
- bindParameter("flip_mode", m_flip_mode, "1");
- // </rtc-template>
-
- return RTC::RTC_OK;
-}
-
-/*
-RTC::ReturnCode_t Flip::onFinalize()
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Flip::onStartup(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Flip::onShutdown(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-
-RTC::ReturnCode_t Flip::onActivated(RTC::UniqueId ec_id)
-{
- // ƒCƒ[ƒW—pƒƒ‚ƒŠ‚̉Šú‰»
- m_image_buff = NULL;
- m_flip_image_buff = NULL;
-
- // OutPort‚̉æ–ʃTƒCƒY‚̉Šú‰»
- m_image_flip.width = 0;
- m_image_flip.height = 0;
-
- return RTC::RTC_OK;
-}
-
-
-RTC::ReturnCode_t Flip::onDeactivated(RTC::UniqueId ec_id)
-{
- if(m_image_buff != NULL)
- {
- // ƒCƒ[ƒW—pƒƒ‚ƒŠ‚̉ð•ú
- cvReleaseImage(&m_image_buff);
- cvReleaseImage(&m_flip_image_buff);
- }
-
- return RTC::RTC_OK;
-}
-
-
-RTC::ReturnCode_t Flip::onExecute(RTC::UniqueId ec_id)
-{
- // V‚µ‚¢ƒf[ƒ^‚̃`ƒFƒbƒN
- if (m_image_origIn.isNew()) {
- // InPortƒf[ƒ^‚Ì“Ç‚Ýž‚Ý
- m_image_origIn.read();
-
- // InPort‚ÆOutPort‚̉æ–ʃTƒCƒYˆ—‚¨‚æ‚уCƒ[ƒW—pƒƒ‚ƒŠ‚ÌŠm•Û
- if( m_image_orig.width != m_image_flip.width || m_image_orig.height != m_image_flip.height)
- {
- m_image_flip.width = m_image_orig.width;
- m_image_flip.height = m_image_orig.height;
-
- // InPort‚̃Cƒ[ƒWƒTƒCƒY‚ª•ÏX‚³‚ꂽê‡
- if(m_image_buff != NULL)
- {
- cvReleaseImage(&m_image_buff);
- cvReleaseImage(&m_flip_image_buff);
- }
-
- // ƒCƒ[ƒW—pƒƒ‚ƒŠ‚ÌŠm•Û
- m_image_buff = cvCreateImage(cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 3);
- m_flip_image_buff = cvCreateImage(cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 3);
- }
-
- // InPort‚̉摜ƒf[ƒ^‚ðIplImage‚ÌimageData‚ɃRƒs[
- memcpy(m_image_buff->imageData,(void *)&(m_image_orig.pixels[0]),m_image_orig.pixels.length());
-
- // InPort‚©‚ç‚̉摜ƒf[ƒ^‚𔽓]‚·‚éB m_flip_mode 0: XŽ²Žü‚è, 1: YŽ²Žü‚è, -1: —¼•û‚ÌŽ²Žü‚è
- cvFlip(m_image_buff, m_flip_image_buff, m_flip_mode);
-
- // ‰æ‘œƒf[ƒ^‚̃TƒCƒYŽæ“¾
- int len = m_flip_image_buff->nChannels * m_flip_image_buff->width * m_flip_image_buff->height;
- m_image_flip.pixels.length(len);
-
- // ”½“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚ɃRƒs[
- memcpy((void *)&(m_image_flip.pixels[0]),m_flip_image_buff->imageData,len);
-
- // ”½“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚©‚ço—Í‚·‚éB
- m_image_flipOut.write();
- }
-
- return RTC::RTC_OK;
-}
-
-/*
-RTC::ReturnCode_t Flip::onAborting(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Flip::onError(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Flip::onReset(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Flip::onStateUpdate(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-/*
-RTC::ReturnCode_t Flip::onRateChanged(RTC::UniqueId ec_id)
-{
- return RTC::RTC_OK;
-}
-*/
-
-
-
-extern "C"
-{
-
- void FlipInit(RTC::Manager* manager)
- {
- coil::Properties profile(flip_spec);
- manager->registerFactory(profile,
- RTC::Create<Flip>,
- RTC::Delete<Flip>);
- }
-
-};
-
-
+// -*- C++ -*-
+/*!
+ * @file Flip.cpp
+ * @brief Flip image component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include "Flip.h"
+#include <iostream>
+using namespace std;
+
+// Module specification
+// <rtc-template block="module_spec">
+static const char* flip_spec[] =
+ {
+ "implementation_id", "Flip",
+ "type_name", "Flip",
+ "description", "Flip image component",
+ "version", "1.1.0",
+ "vendor", "AIST",
+ "category", "Category",
+ "activity_type", "PERIODIC",
+ "kind", "DataFlowComponent",
+ "max_instance", "1",
+ "language", "C++",
+ "lang_type", "compile",
+ // Configuration variables
+ "conf.default.flip_mode", "1",
+ // Widget
+ "conf.__widget__.flip_mode", "radio",
+ // Constraints
+ "conf.__constraints__.flip_mode", "(-1,0,1)",
+ ""
+ };
+// </rtc-template>
+
+/*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+Flip::Flip(RTC::Manager* manager)
+ // <rtc-template block="initializer">
+ : RTC::DataFlowComponentBase(manager),
+ m_image_origIn("original_image", m_image_orig),
+ m_image_flipOut("fliped_image", m_image_flip)
+
+ // </rtc-template>
+{
+}
+
+/*!
+ * @brief destructor
+ */
+Flip::~Flip()
+{
+}
+
+
+
+RTC::ReturnCode_t Flip::onInitialize()
+{
+ // Registration: InPort/OutPort/Service
+ // <rtc-template block="registration">
+ // Set InPort buffers
+ addInPort("original_image", m_image_origIn);
+
+ // Set OutPort buffer
+ addOutPort("fliped_image", m_image_flipOut);
+
+ // Set service provider to Ports
+
+ // Set service consumers to Ports
+
+ // Set CORBA Service Ports
+
+ // </rtc-template>
+
+ // <rtc-template block="bind_config">
+ // Bind variables and configuration variable
+ bindParameter("flip_mode", m_flip_mode, "1");
+ // </rtc-template>
+
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t Flip::onFinalize()
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Flip::onStartup(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Flip::onShutdown(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+RTC::ReturnCode_t Flip::onActivated(RTC::UniqueId ec_id)
+{
+ /* イメージ用メモリã®åˆæœŸåŒ– */
+ m_image_buff = NULL;
+ m_flip_image_buff = NULL;
+
+ /* OutPortã®ç”»é¢ã‚µã‚¤ã‚ºã®åˆæœŸåŒ– */
+ m_image_flip.width = 0;
+ m_image_flip.height = 0;
+
+ return RTC::RTC_OK;
+}
+
+
+RTC::ReturnCode_t Flip::onDeactivated(RTC::UniqueId ec_id)
+{
+ if(m_image_buff != NULL)
+ {
+ /* イメージ用メモリã®è§£æ”¾ */
+ cvReleaseImage(&m_image_buff);
+ cvReleaseImage(&m_flip_image_buff);
+ }
+
+ return RTC::RTC_OK;
+}
+
+
+RTC::ReturnCode_t Flip::onExecute(RTC::UniqueId ec_id)
+{
+ /* æ–°ã—ã„データã®ãƒã‚§ãƒƒã‚¯ */
+ if (m_image_origIn.isNew()) {
+ /* InPortデータã®èªã¿è¾¼ã¿ */
+ m_image_origIn.read();
+
+ /* InPortã¨OutPortã®ç”»é¢ã‚µã‚¤ã‚ºå‡¦ç†ãŠã‚ˆã³ã‚¤ãƒ¡ãƒ¼ã‚¸ç”¨ãƒ¡ãƒ¢ãƒªã®ç¢ºä¿ */
+ if( m_image_orig.width != m_image_flip.width || m_image_orig.height != m_image_flip.height)
+ {
+ m_image_flip.width = m_image_orig.width;
+ m_image_flip.height = m_image_orig.height;
+
+ /* InPortã®ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚µã‚¤ã‚ºãŒå¤‰æ›´ã•ã‚ŒãŸå ´åˆ */
+ if(m_image_buff != NULL)
+ {
+ cvReleaseImage(&m_image_buff);
+ cvReleaseImage(&m_flip_image_buff);
+ }
+
+ /* イメージ用メモリã®ç¢ºä¿ */
+ m_image_buff = cvCreateImage(cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 3);
+ m_flip_image_buff = cvCreateImage(cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 3);
+ }
+
+ /* InPortã®ç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’IplImageã®imageDataã«ã‚³ãƒ”ー */
+ memcpy(m_image_buff->imageData,(void *)&(m_image_orig.pixels[0]),m_image_orig.pixels.length());
+
+ /* InPortã‹ã‚‰ã®ç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’å転ã™ã‚‹ã€‚ m_flip_mode 0: X軸周り, 1: Y軸周り, -1: 両方ã®è»¸å‘¨ã‚Š */
+ cvFlip(m_image_buff, m_flip_image_buff, m_flip_mode);
+
+ /* ç”»åƒãƒ‡ãƒ¼ã‚¿ã®ã‚µã‚¤ã‚ºå–å¾— */
+ int len = m_flip_image_buff->nChannels * m_flip_image_buff->width * m_flip_image_buff->height;
+ m_image_flip.pixels.length(len);
+
+ /* å転ã—ãŸç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã«ã‚³ãƒ”ー */
+ memcpy((void *)&(m_image_flip.pixels[0]),m_flip_image_buff->imageData,len);
+
+ /* å転ã—ãŸç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã‹ã‚‰å‡ºåŠ›ã™ã‚‹ã€‚ */
+ m_image_flipOut.write();
+ }
+
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t Flip::onAborting(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Flip::onError(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Flip::onReset(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Flip::onStateUpdate(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t Flip::onRateChanged(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+
+extern "C"
+{
+
+ void FlipInit(RTC::Manager* manager)
+ {
+ coil::Properties profile(flip_spec);
+ manager->registerFactory(profile,
+ RTC::Create<Flip>,
+ RTC::Delete<Flip>);
+ }
+
+};
+
+
More information about the openrtm-commit
mailing list