[openrtm-commit:02416] r186 - in trunk/ImageProcessing/opencv: . components components/Affine components/Affine/cmake components/Affine/src components/BackGroundSubtractionSimple components/BackGroundSubtractionSimple/cmake components/BackGroundSubtractionSimple/src components/Binarization components/Binarization/cmake components/Binarization/src components/CameraViewer components/CameraViewer/cmake components/CameraViewer/src components/Chromakey components/Chromakey/cmake components/Chromakey/src components/Dilationerosion components/Dilationerosion/cmake components/Dilationerosion/src components/DirectShowCam components/DirectShowCam/cmake components/DirectShowCam/src components/Edge components/Edge/cmake components/Edge/src components/Findcontour components/Findcontour/cmake components/Findcontour/src components/Flip components/Flip/cmake components/Flip/src components/Histogram components/Histogram/cmake components/Histogram/src components/Houghline components/Houghline/cmake components/Houghline/src components/ImageCalibration components/ImageCalibration/cmake components/ImageCalibration/src components/ImageSubstraction components/ImageSubstraction/cmake components/ImageSubstraction/src components/MFCamera components/MFCamera/cmake components/MFCamera/src components/ObjectTracking components/ObjectTracking/cmake components/ObjectTracking/src components/OpenCVCamera components/OpenCVCamera/cmake components/OpenCVCamera/src components/PGRCamera components/PGRCamera/cmake components/PGRCamera/src components/Perspective components/Perspective/cmake components/Perspective/src components/RockPaperScissors components/RockPaperScissors/cmake components/RockPaperScissors/src components/Rotate components/Rotate/cmake components/Rotate/src components/Scale components/Scale/cmake components/Scale/src components/Sepia components/Sepia/cmake components/Sepia/src components/SubStractCaptureImage components/SubStractCaptureImage/cmake components/SubStractCaptureImage/src components/Template components/Template/cmake components/Template/src components/TkCalibGUI components/Translate components/Translate/cmake components/Translate/src
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 2月 10日 (金) 16:26:14 JST
Author: kawauchi
Date: 2017-02-10 16:26:14 +0900 (Fri, 10 Feb 2017)
New Revision: 186
Added:
trunk/ImageProcessing/opencv/build_linux_package.sh.in
Removed:
trunk/ImageProcessing/opencv/build_deb_package.sh
Modified:
trunk/ImageProcessing/opencv/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Affine/README.Affine
trunk/ImageProcessing/opencv/components/Affine/RTC.xml
trunk/ImageProcessing/opencv/components/Affine/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Affine/src/Affine.cpp
trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt
trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/README.BackGroundSubtractionSimple
trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/RTC.xml
trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/src/BackGroundSubtractionSimple.cpp
trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Binarization/README.Binarization
trunk/ImageProcessing/opencv/components/Binarization/RTC.xml
trunk/ImageProcessing/opencv/components/Binarization/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Binarization/src/Binarization.cpp
trunk/ImageProcessing/opencv/components/CMakeLists.txt
trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt
trunk/ImageProcessing/opencv/components/CameraViewer/README.CameraViewer
trunk/ImageProcessing/opencv/components/CameraViewer/RTC.xml
trunk/ImageProcessing/opencv/components/CameraViewer/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/CameraViewer/src/CameraViewer.cpp
trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Chromakey/README.Chromakey
trunk/ImageProcessing/opencv/components/Chromakey/RTC.xml
trunk/ImageProcessing/opencv/components/Chromakey/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Chromakey/src/Chromakey.cpp
trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Dilationerosion/README.DilationErosion
trunk/ImageProcessing/opencv/components/Dilationerosion/RTC.xml
trunk/ImageProcessing/opencv/components/Dilationerosion/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Dilationerosion/src/DilationErosion.cpp
trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt
trunk/ImageProcessing/opencv/components/DirectShowCam/README.DirectShowCam
trunk/ImageProcessing/opencv/components/DirectShowCam/RTC.xml
trunk/ImageProcessing/opencv/components/DirectShowCam/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/DirectShowCam/src/DirectShowCam.cpp
trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Edge/README.Edge
trunk/ImageProcessing/opencv/components/Edge/RTC.xml
trunk/ImageProcessing/opencv/components/Edge/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Edge/src/Edge.cpp
trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Findcontour/README.Findcontour
trunk/ImageProcessing/opencv/components/Findcontour/RTC.xml
trunk/ImageProcessing/opencv/components/Findcontour/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Findcontour/src/Findcontour.cpp
trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Flip/README.Flip
trunk/ImageProcessing/opencv/components/Flip/RTC.xml
trunk/ImageProcessing/opencv/components/Flip/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Flip/src/Flip.cpp
trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Histogram/README.Histogram
trunk/ImageProcessing/opencv/components/Histogram/RTC.xml
trunk/ImageProcessing/opencv/components/Histogram/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Histogram/src/Histogram.cpp
trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Houghline/README.Hough
trunk/ImageProcessing/opencv/components/Houghline/RTC.xml
trunk/ImageProcessing/opencv/components/Houghline/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Houghline/src/Hough.cpp
trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
trunk/ImageProcessing/opencv/components/ImageCalibration/README.ImageCalibration
trunk/ImageProcessing/opencv/components/ImageCalibration/RTC.xml
trunk/ImageProcessing/opencv/components/ImageCalibration/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibration.cpp
trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt
trunk/ImageProcessing/opencv/components/ImageSubstraction/README.ImageSubstraction
trunk/ImageProcessing/opencv/components/ImageSubstraction/RTC.xml
trunk/ImageProcessing/opencv/components/ImageSubstraction/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/ImageSubstraction/src/ImageSubstraction.cpp
trunk/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt
trunk/ImageProcessing/opencv/components/MFCamera/README.MFCamera
trunk/ImageProcessing/opencv/components/MFCamera/RTC.xml
trunk/ImageProcessing/opencv/components/MFCamera/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/MFCamera/src/MFCamera.cpp
trunk/ImageProcessing/opencv/components/MFCamera/src/MFUtils.cpp
trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
trunk/ImageProcessing/opencv/components/ObjectTracking/README.ObjectTracking
trunk/ImageProcessing/opencv/components/ObjectTracking/RTC.xml
trunk/ImageProcessing/opencv/components/ObjectTracking/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp
trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt
trunk/ImageProcessing/opencv/components/OpenCVCamera/README.OpenCVCamera
trunk/ImageProcessing/opencv/components/OpenCVCamera/RTC.xml
trunk/ImageProcessing/opencv/components/OpenCVCamera/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/OpenCVCamera/src/OpenCVCamera.cpp
trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt
trunk/ImageProcessing/opencv/components/PGRCamera/README.PGRCamera
trunk/ImageProcessing/opencv/components/PGRCamera/RTC.xml
trunk/ImageProcessing/opencv/components/PGRCamera/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/PGRCamera/src/PGRCamera.cpp
trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Perspective/README.Perspective
trunk/ImageProcessing/opencv/components/Perspective/RTC.xml
trunk/ImageProcessing/opencv/components/Perspective/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Perspective/src/Perspective.cpp
trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt
trunk/ImageProcessing/opencv/components/RockPaperScissors/README.RockPaperScissors
trunk/ImageProcessing/opencv/components/RockPaperScissors/RTC.xml
trunk/ImageProcessing/opencv/components/RockPaperScissors/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/RockPaperScissors/src/RockPaperScissors.cpp
trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Rotate/README.Rotate
trunk/ImageProcessing/opencv/components/Rotate/RTC.xml
trunk/ImageProcessing/opencv/components/Rotate/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Rotate/src/Rotate.cpp
trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Scale/README.Scale
trunk/ImageProcessing/opencv/components/Scale/RTC.xml
trunk/ImageProcessing/opencv/components/Scale/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Scale/src/Scale.cpp
trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Sepia/README.Sepia
trunk/ImageProcessing/opencv/components/Sepia/RTC.xml
trunk/ImageProcessing/opencv/components/Sepia/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Sepia/src/Sepia.cpp
trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt
trunk/ImageProcessing/opencv/components/SubStractCaptureImage/README.SubStractCaptureImage
trunk/ImageProcessing/opencv/components/SubStractCaptureImage/RTC.xml
trunk/ImageProcessing/opencv/components/SubStractCaptureImage/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/SubStractCaptureImage/src/SubStractCaptureImage.cpp
trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Template/README.Template
trunk/ImageProcessing/opencv/components/Template/RTC.xml
trunk/ImageProcessing/opencv/components/Template/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Template/src/Template.cpp
trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt
trunk/ImageProcessing/opencv/components/TkCalibGUI/README.TkCalibGUI
trunk/ImageProcessing/opencv/components/TkCalibGUI/RTC.xml
trunk/ImageProcessing/opencv/components/TkCalibGUI/TkCalibGUIComp.py
trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Translate/README.Translate
trunk/ImageProcessing/opencv/components/Translate/RTC.xml
trunk/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in
trunk/ImageProcessing/opencv/components/Translate/src/Translate.cpp
Log:
The judgment of LINUX_PACKAGE_GENERATOR has been added. Package version has been updated to 1.2.0. refs #3825
Modified: trunk/ImageProcessing/opencv/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -3,3 +3,28 @@
project(ImageProcessing_opencv)
SUBDIRS(components)
set(SolutionDir ${PROJECT_SOURCE_DIR})
+
+if(NOT WIN32)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32)
+
+configure_file(${SolutionDir}/build_linux_package.sh.in
+ ${PROJECT_BINARY_DIR}/build_linux_package.sh
+ @ONLY
+)
Deleted: trunk/ImageProcessing/opencv/build_deb_package.sh
===================================================================
--- trunk/ImageProcessing/opencv/build_deb_package.sh 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/build_deb_package.sh 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-grep -l 'Translate' CPackConfig.cmake | xargs sed -i.bak -e 's/Translate/ImageProcessing/g'
-cpack -C CPackConfig.cmake
Added: trunk/ImageProcessing/opencv/build_linux_package.sh.in
===================================================================
--- trunk/ImageProcessing/opencv/build_linux_package.sh.in (rev 0)
+++ trunk/ImageProcessing/opencv/build_linux_package.sh.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+GENERATOR=@LINUX_PACKAGE_GENERATOR@
+echo "Linux package generator:" ${GENERATOR}
+
+cpack -C CPackConfig.cmake
+
+if test "x${GENERATOR}" = "xDEB" ;then
+ rename s/translate/imageprocessing/g *.deb
+ newname=`ls *.deb`
+fi
+if test "x${GENERATOR}" = "xRPM" ;then
+ rename Translate Imageprocessing *.rpm
+ newname=`ls *.rpm`
+fi
+
+echo "Rename package : " ${newname}
+
Property changes on: trunk/ImageProcessing/opencv/build_linux_package.sh.in
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -4,15 +4,33 @@
project(Affine)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Affine version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Affine version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Affine 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")
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
set(PROJECT_TYPE "c++/opencv-rtcs")
Modified: trunk/ImageProcessing/opencv/components/Affine/README.Affine
===================================================================
--- trunk/ImageProcessing/opencv/components/Affine/README.Affine 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Affine/README.Affine 2017-02-10 07:26:14 UTC (rev 186)
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Affine
Description: Affine image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Affine/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Affine/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Affine/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Affine:1.1.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="Affine" rtc:updateDate="2013-06-06T10:46:58+09:00" rtc:creationDate="2013-06-06T10:46:58+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Affine image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Affine"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Affine:1.2.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="Affine" rtc:updateDate="2013-06-06T10:46:58+09:00" rtc:creationDate="2013-06-06T10:46:58+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Affine image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Affine"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Affine/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Affine/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Affine/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Affine/src/Affine.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Affine/src/Affine.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Affine/src/Affine.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -20,7 +20,7 @@
"implementation_id", "Affine",
"type_name", "Affine",
"description", "Affine image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(BackGroundSubtractionSimple)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "BackGroundSubtractionSimple version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "BackGroundSubtractionSimple version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "BackGroundSubtractionSimple 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/README.BackGroundSubtractionSimple
===================================================================
--- trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/README.BackGroundSubtractionSimple 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/README.BackGroundSubtractionSimple 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=BackGroundSubtractionSimple
-# --module-desc='BackGroundSubtractionSimple component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='BackGroundSubtractionSimple component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=control_mode:char:b --config=diff_mode:char:0 --config=noise_mode:char:0 --config=threshold_level:int:20
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: BackGroundSubtractionSimple
Description: BackGroundSubtractionSimple component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:BackGroundSubtractionSimple:1.1.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="BackGroundSubtractionSimple" rtc:updateDate="2013-06-07T11:59:33+09:00" rtc:creationDate="2013-06-07T11:59:33+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="BackGroundSubtractionSimple component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="BackGroundSubtractionSimple"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:BackGroundSubtractionSimple:1.2.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="BackGroundSubtractionSimple" rtc:updateDate="2013-06-07T11:59:33+09:00" rtc:creationDate="2013-06-07T11:59:33+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="BackGroundSubtractionSimple component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="BackGroundSubtractionSimple"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/src/BackGroundSubtractionSimple.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/src/BackGroundSubtractionSimple.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/src/BackGroundSubtractionSimple.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "BackGroundSubtractionSimple",
"type_name", "BackGroundSubtractionSimple",
"description", "BackGroundSubtractionSimple component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Binarization)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Binarization version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Binarization version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Binarization 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Binarization/README.Binarization
===================================================================
--- trunk/ImageProcessing/opencv/components/Binarization/README.Binarization 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Binarization/README.Binarization 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Binarization
-# --module-desc='Binarization image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Binarization image component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=threshold_level:int:128
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Binarization
Description: Binarization image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Binarization/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Binarization/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Binarization/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Binarization:1.1.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="Binarization" rtc:updateDate="2013-06-07T13:54:50+09:00" rtc:creationDate="2013-06-07T13:54:50+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Binarization image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Binarization"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Binarization:1.2.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="Binarization" rtc:updateDate="2013-06-07T13:54:50+09:00" rtc:creationDate="2013-06-07T13:54:50+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Binarization image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Binarization"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Binarization/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Binarization/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Binarization/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Binarization/src/Binarization.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Binarization/src/Binarization.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Binarization/src/Binarization.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -18,7 +18,7 @@
"implementation_id", "Binarization",
"type_name", "Binarization",
"description", "Binarization image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -4,7 +4,9 @@
include(DirectShowCam/BaseClasses/FindDirectShow.cmake)
include(PGRCamera/cmake/FindFlyCapture.cmake)
-add_subdirectory(TkCalibGUI)
+if(NOT CPACK_RPM_PACKAGE_ARCHITECTURE)
+ add_subdirectory(TkCalibGUI)
+endif()
add_subdirectory(Affine)
add_subdirectory(BackGroundSubtractionSimple)
add_subdirectory(Binarization)
Modified: trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(CameraViewer)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "CameraViewer version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "CameraViewer version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "USB Camera Monitor 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/CameraViewer/README.CameraViewer
===================================================================
--- trunk/ImageProcessing/opencv/components/CameraViewer/README.CameraViewer 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/CameraViewer/README.CameraViewer 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=CameraViewer
-# --module-desc='USB Camera Monitor component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='USB Camera Monitor component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=image_height:int:240 --config=image_width:int:320
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: CameraViewer
Description: USB Camera Monitor component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/CameraViewer/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/CameraViewer/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/CameraViewer/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:CameraViewer:1.1.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="CameraViewer" rtc:updateDate="2013-06-07T14:32:17+09:00" rtc:creationDate="2013-06-07T14:32:17+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="USB Camera Monitor component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="CameraViewer"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:CameraViewer:1.2.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="CameraViewer" rtc:updateDate="2013-06-07T14:32:17+09:00" rtc:creationDate="2013-06-07T14:32:17+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="USB Camera Monitor component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="CameraViewer"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/CameraViewer/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/CameraViewer/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/CameraViewer/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/CameraViewer/src/CameraViewer.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/CameraViewer/src/CameraViewer.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/CameraViewer/src/CameraViewer.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "CameraViewer",
"type_name", "CameraViewer",
"description", "USB Camera Monitor component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Chromakey)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Chromakey version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Chromakey version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Chromakey 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Chromakey/README.Chromakey
===================================================================
--- trunk/ImageProcessing/opencv/components/Chromakey/README.Chromakey 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Chromakey/README.Chromakey 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Chromakey
-# --module-desc='Chromakey image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Chromakey image component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=lower_blue:int:0 --config=upper_blue:int:0 --config=lower_yellow:int:0 --config=upper_yellow:int:0 --config=lower_red:int:0 --config=upper_red:int:0
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Chromakey
Description: Chromakey image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Chromakey/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Chromakey/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Chromakey/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Chromakey:1.1.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="Chromakey" rtc:updateDate="2016-05-06T18:45:57.371+09:00" rtc:creationDate="2013-06-07T15:16:36+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Chromakey image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Chromakey"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Chromakey:1.2.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="Chromakey" rtc:updateDate="2016-05-06T18:45:57.371+09:00" rtc:creationDate="2013-06-07T15:16:36+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Chromakey image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Chromakey"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Chromakey/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Chromakey/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Chromakey/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Chromakey/src/Chromakey.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Chromakey/src/Chromakey.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Chromakey/src/Chromakey.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "Chromakey",
"type_name", "Chromakey",
"description", "Chromakey image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(DilationErosion)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "DilationErosion version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "DilationErosion version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Dilation and erosion 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Dilationerosion/README.DilationErosion
===================================================================
--- trunk/ImageProcessing/opencv/components/Dilationerosion/README.DilationErosion 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Dilationerosion/README.DilationErosion 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=DilationErosion
-# --module-desc='Dilation and erosion component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Dilation and erosion component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=dilation_count:int:3 --config=erosion_count:int:3 --config=threshold:int:128
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: DilationErosion
Description: Dilation and erosion component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Dilationerosion/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Dilationerosion/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Dilationerosion/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:DilationErosion:1.1.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="Dilationerosion" rtc:updateDate="2013-06-07T15:40:38+09:00" rtc:creationDate="2013-06-07T15:40:38+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Dilation and erosion component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="DilationErosion"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:DilationErosion:1.2.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="Dilationerosion" rtc:updateDate="2013-06-07T15:40:38+09:00" rtc:creationDate="2013-06-07T15:40:38+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Dilation and erosion component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="DilationErosion"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Dilationerosion/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Dilationerosion/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Dilationerosion/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Dilationerosion/src/DilationErosion.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Dilationerosion/src/DilationErosion.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Dilationerosion/src/DilationErosion.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "DilationErosion",
"type_name", "DilationErosion",
"description", "Dilation and erosion component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,31 +1,49 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(DirectShowCam)
-SUBDIRS(BaseClasses)
-
+SUBDIRS(BaseClasses)
+
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "DirectShowCam version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "DirectShowCam version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "DirectShowCam Module")
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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -45,20 +63,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/DirectShowCam/README.DirectShowCam
===================================================================
--- trunk/ImageProcessing/opencv/components/DirectShowCam/README.DirectShowCam 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/DirectShowCam/README.DirectShowCam 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=DirectShowCam
-# --module-desc='DirectShowCam Module' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='DirectShowCam Module' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --outport=m_FIN_OUTPORT:RTC::CameraImage
@@ -19,7 +19,7 @@
# <rtc-template block="module">
Module Name: DirectShowCam
Description: DirectShowCam Module
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/DirectShowCam/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/DirectShowCam/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/DirectShowCam/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:DirectShowCam:1.1.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="DirectShowCam" rtc:updateDate="2013-06-07T16:09:05+09:00" rtc:creationDate="2013-06-07T16:09:05+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="DirectShowCam Module" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="DirectShowCam"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:DirectShowCam:1.2.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="DirectShowCam" rtc:updateDate="2013-06-07T16:09:05+09:00" rtc:creationDate="2013-06-07T16:09:05+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="DirectShowCam Module" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="DirectShowCam"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/DirectShowCam/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/DirectShowCam/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/DirectShowCam/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/DirectShowCam/src/DirectShowCam.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/DirectShowCam/src/DirectShowCam.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/DirectShowCam/src/DirectShowCam.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -45,7 +45,7 @@
"implementation_id", "DirectShowCam",
"type_name", "DirectShowCam",
"description", "DirectShowCam Module",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Edge)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Edge version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Edge version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Edge 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Edge/README.Edge
===================================================================
--- trunk/ImageProcessing/opencv/components/Edge/README.Edge 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Edge/README.Edge 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Edge
-# --module-desc='Edge image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Edge image component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=sobel_x_size:int:3 --config=sobel_y_size:int:3 --config=laplacian_size:int:3
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Edge
Description: Edge image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Edge/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Edge/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Edge/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Edge:1.1.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="Edge" rtc:updateDate="2013-06-11T15:07:45+09:00" rtc:creationDate="2013-06-11T15:07:45+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Edge image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Edge"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Edge:1.2.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="Edge" rtc:updateDate="2013-06-11T15:07:45+09:00" rtc:creationDate="2013-06-11T15:07:45+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Edge image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Edge"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Edge/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Edge/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Edge/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Edge/src/Edge.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Edge/src/Edge.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Edge/src/Edge.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -19,7 +19,7 @@
"implementation_id", "Edge",
"type_name", "Edge",
"description", "Edge image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Findcontour)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Findcontour version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Findcontour version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Findcontour 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Findcontour/README.Findcontour
===================================================================
--- trunk/ImageProcessing/opencv/components/Findcontour/README.Findcontour 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Findcontour/README.Findcontour 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Findcontour
-# --module-desc='Findcontour component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Findcontour component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=threshold_level:int:100 --config=contour_level:int:1 --config=line_thickness:int:2 --config=line_type:int:CV_AA
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Findcontour
Description: Findcontour component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Findcontour/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Findcontour/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Findcontour/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Findcontour:1.1.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="Findcontour" rtc:updateDate="2013-06-11T15:53:22+09:00" rtc:creationDate="2013-06-11T15:53:22+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Findcontour component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Findcontour"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Findcontour:1.2.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="Findcontour" rtc:updateDate="2013-06-11T15:53:22+09:00" rtc:creationDate="2013-06-11T15:53:22+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Findcontour component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Findcontour"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Findcontour/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Findcontour/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Findcontour/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Findcontour/src/Findcontour.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Findcontour/src/Findcontour.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Findcontour/src/Findcontour.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -18,7 +18,7 @@
"implementation_id", "Findcontour",
"type_name", "Findcontour",
"description", "Findcontour component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+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")
+set(PROJECT_VERSION 1.2.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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Flip/README.Flip
===================================================================
--- trunk/ImageProcessing/opencv/components/Flip/README.Flip 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Flip/README.Flip 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
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-desc='Flip image component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=flip_mode:int:1
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Flip
Description: Flip image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Flip/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Flip/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Flip/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -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.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:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Flip:1.2.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.2.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"/>
Modified: trunk/ImageProcessing/opencv/components/Flip/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Flip/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Flip/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Flip/src/Flip.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Flip/src/Flip.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Flip/src/Flip.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -18,7 +18,7 @@
"implementation_id", "Flip",
"type_name", "Flip",
"description", "Flip image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Histogram)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Histogram version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Histogram version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Histogram 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Histogram/README.Histogram
===================================================================
--- trunk/ImageProcessing/opencv/components/Histogram/README.Histogram 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Histogram/README.Histogram 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Histogram
-# --module-desc='Histogram image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Histogram image component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=brightness:int:100 --config=contrast:int:100
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Histogram
Description: Histogram image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Histogram/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Histogram/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Histogram/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Histogram: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="Histogram" rtc:updateDate="2013-08-27T13:31:31+09:00" rtc:creationDate="2013-08-27T13:31:31+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Histogram image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Histogram"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Histogram:1.2.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="Histogram" rtc:updateDate="2013-08-27T13:31:31+09:00" rtc:creationDate="2013-08-27T13:31:31+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Histogram image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Histogram"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Histogram/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Histogram/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Histogram/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Histogram/src/Histogram.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Histogram/src/Histogram.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Histogram/src/Histogram.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -18,7 +18,7 @@
"implementation_id", "Histogram",
"type_name", "Histogram",
"description", "Histogram image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -4,26 +4,44 @@
project(Hough)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Hough version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Hough version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Hough line 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Houghline/README.Hough
===================================================================
--- trunk/ImageProcessing/opencv/components/Houghline/README.Hough 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Houghline/README.Hough 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Hough
-# --module-desc='Hough line component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Hough line component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=canny_thresld1:int:100 --config=canny_thresld2:int:100 --config=hough_method:string:PROBABILISTIC --config=hough_thresld:int:50 --config=hough_param1:double:50 --config=hough_param2:double:10 --config=line_color_R:int:255 --config=line_color_G:int:0 --config=line_color_B:int:0 --config=line_thickness:int:2 --config=line_type:string:8
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Hough
Description: Hough line component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Houghline/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Houghline/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Houghline/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Hough: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="Houghline" rtc:updateDate="2013-11-21T12:45:44+09:00" rtc:creationDate="2013-11-20T13:45:21+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Hough line component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Hough"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Hough:1.2.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="Houghline" rtc:updateDate="2013-11-21T12:45:44+09:00" rtc:creationDate="2013-11-20T13:45:21+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Hough line component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Hough"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Houghline/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Houghline/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Houghline/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,98 +1,103 @@
-set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
-set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
-set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
-set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
-set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
-set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
-
-set(CPACK_COMPONENTS_ALL component)
-set(CPACK_COMPONENT_COMPONENT_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_COMPONENT_DESCRIPTION
- "Component library and stand-alone executable")
-if(INSTALL_HEADERS)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} headers)
- set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
- set(CPACK_COMPONENT_HEADERS_DESCRIPTION
- "Header files from the component.")
- set(CPACK_COMPONENT_HEADERS_DEPENDS component)
-endif(INSTALL_HEADERS)
-if(INSTALL_IDL)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} idl)
- set(CPACK_COMPONENT_IDL_DISPLAY_NAME "IDL files")
- set(CPACK_COMPONENT_IDL_DESCRIPTION
- "IDL files for the component's services.")
- set(CPACK_COMPONENT_IDL_DEPENDS component)
-endif(INSTALL_IDL)
-set(INSTALL_EXAMPLES @BUILD_EXAMPLES@)
-if(INSTALL_EXAMPLES)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} examples)
- set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
- set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION
- "Sample configuration files and other component resources.")
- set(CPACK_COMPONENT_EXAMPLES_DEPENDS component)
-endif(INSTALL_EXAMPLES)
-set(INSTALL_DOCUMENTATION @BUILD_DOCUMENTATION@)
-if(INSTALL_DOCUMENTATION)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} documentation)
- set(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
- set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
- "Component documentation")
- set(CPACK_COMPONENT_DOCUMENTATION_DEPENDS component)
-endif(INSTALL_DOCUMENTATION)
-if(INSTALL_SOURCES)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} sources)
- set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
- set(CPACK_COMPONENT_SOURCES_DESCRIPTION
- "Source files from the component.")
-endif(INSTALL_SOURCES)
-
-IF (WIN32)
-
- # Windows WiX package settings
-
- set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
- set(CPACK_WIX_LANG "ja-jp")
- set(CPACK_RESOURCE_FILE_LICENSE
- "@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
- configure_file(
- "@CMAKE_CURRENT_SOURCE_DIR@/cmake/wix.xsl.in"
- "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-
-
- #
- #
- #
-# 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)
- set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
- if(INSTALL_DOCUMENTATION)
- set(CPACK_NSIS_MENU_LINKS
- "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/html/index.html"
- "Component documentation")
- endif(INSTALL_DOCUMENTATION)
- string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
- "@CMAKE_INSTALL_PREFIX@")
- file(TO_NATIVE_PATH "${install_prefix_root}" install_prefix_root)
- set(CPACK_NSIS_INSTALL_ROOT "${install_prefix_root}")
- set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
- " Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
- Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config-version.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
- 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)
-
+set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
+set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
+set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
+set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
+set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
+set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
+
+set(CPACK_COMPONENTS_ALL component)
+set(CPACK_COMPONENT_COMPONENT_DISPLAY_NAME "Applications")
+set(CPACK_COMPONENT_COMPONENT_DESCRIPTION
+ "Component library and stand-alone executable")
+if(INSTALL_HEADERS)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} headers)
+ set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
+ set(CPACK_COMPONENT_HEADERS_DESCRIPTION
+ "Header files from the component.")
+ set(CPACK_COMPONENT_HEADERS_DEPENDS component)
+endif(INSTALL_HEADERS)
+if(INSTALL_IDL)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} idl)
+ set(CPACK_COMPONENT_IDL_DISPLAY_NAME "IDL files")
+ set(CPACK_COMPONENT_IDL_DESCRIPTION
+ "IDL files for the component's services.")
+ set(CPACK_COMPONENT_IDL_DEPENDS component)
+endif(INSTALL_IDL)
+set(INSTALL_EXAMPLES @BUILD_EXAMPLES@)
+if(INSTALL_EXAMPLES)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} examples)
+ set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
+ set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION
+ "Sample configuration files and other component resources.")
+ set(CPACK_COMPONENT_EXAMPLES_DEPENDS component)
+endif(INSTALL_EXAMPLES)
+set(INSTALL_DOCUMENTATION @BUILD_DOCUMENTATION@)
+if(INSTALL_DOCUMENTATION)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} documentation)
+ set(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
+ "Component documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DEPENDS component)
+endif(INSTALL_DOCUMENTATION)
+if(INSTALL_SOURCES)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} sources)
+ set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
+ set(CPACK_COMPONENT_SOURCES_DESCRIPTION
+ "Source files from the component.")
+endif(INSTALL_SOURCES)
+
+IF (WIN32)
+
+ # Windows WiX package settings
+
+ set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
+ set(CPACK_WIX_LANG "ja-jp")
+ set(CPACK_RESOURCE_FILE_LICENSE
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
+ configure_file(
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/wix.xsl.in"
+ "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl" @ONLY)
+
+ set(CPACK_PACKAGE_FILE_NAME
+ "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+
+
+ #
+ #
+ #
+# 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)
+ set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
+ if(INSTALL_DOCUMENTATION)
+ set(CPACK_NSIS_MENU_LINKS
+ "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/html/index.html"
+ "Component documentation")
+ endif(INSTALL_DOCUMENTATION)
+ string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
+ "@CMAKE_INSTALL_PREFIX@")
+ file(TO_NATIVE_PATH "${install_prefix_root}" install_prefix_root)
+ set(CPACK_NSIS_INSTALL_ROOT "${install_prefix_root}")
+ set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
+ " Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
+ Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config-version.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
+ 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: trunk/ImageProcessing/opencv/components/Houghline/src/Hough.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Houghline/src/Hough.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Houghline/src/Hough.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "Hough",
"type_name", "Hough",
"description", "Hough line component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -4,15 +4,33 @@
project(ImageCalibration)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "ImageCalibration version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "ImageCalibration version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Image Calibration")
set(PROJECT_VENDOR "AIST")
set(PROJECT_AUTHOR "AIST")
set(PROJECT_AUTHOR_SHORT "AIST")
-set(LINUX_PACKAGE_GENERATOR "DEB")
-#set(LINUX_PACKAGE_GENERATOR "RPM")
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
set(PROJECT_TYPE "c++/opencv-rtcs")
Modified: trunk/ImageProcessing/opencv/components/ImageCalibration/README.ImageCalibration
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageCalibration/README.ImageCalibration 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ImageCalibration/README.ImageCalibration 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=ImageCalibration
-# --module-desc='Image Calibration' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Image Calibration' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=checker_w:int:13 --config=checker_h:int:9 --config=image_num:int:5
@@ -22,7 +22,7 @@
# <rtc-template block="module">
Module Name: ImageCalibration
Description: Image Calibration
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/ImageCalibration/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageCalibration/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ImageCalibration/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:ImageCalibration: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="ImageCalibration" rtc:updateDate="2013-12-24T13:43:06+09:00" rtc:creationDate="2013-12-24T13:31:34+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Image Calibration" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ImageCalibration"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:ImageCalibration:1.2.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="ImageCalibration" rtc:updateDate="2013-12-24T13:43:06+09:00" rtc:creationDate="2013-12-24T13:31:34+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Image Calibration" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ImageCalibration"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/ImageCalibration/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageCalibration/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ImageCalibration/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,98 +1,103 @@
-set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
-set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
-set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
-set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
-set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
-set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
-
-set(CPACK_COMPONENTS_ALL component)
-set(CPACK_COMPONENT_COMPONENT_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_COMPONENT_DESCRIPTION
- "Component library and stand-alone executable")
-if(INSTALL_HEADERS)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} headers)
- set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
- set(CPACK_COMPONENT_HEADERS_DESCRIPTION
- "Header files from the component.")
- set(CPACK_COMPONENT_HEADERS_DEPENDS component)
-endif(INSTALL_HEADERS)
-if(INSTALL_IDL)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} idl)
- set(CPACK_COMPONENT_IDL_DISPLAY_NAME "IDL files")
- set(CPACK_COMPONENT_IDL_DESCRIPTION
- "IDL files for the component's services.")
- set(CPACK_COMPONENT_IDL_DEPENDS component)
-endif(INSTALL_IDL)
-set(INSTALL_EXAMPLES @BUILD_EXAMPLES@)
-if(INSTALL_EXAMPLES)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} examples)
- set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
- set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION
- "Sample configuration files and other component resources.")
- set(CPACK_COMPONENT_EXAMPLES_DEPENDS component)
-endif(INSTALL_EXAMPLES)
-set(INSTALL_DOCUMENTATION @BUILD_DOCUMENTATION@)
-if(INSTALL_DOCUMENTATION)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} documentation)
- set(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
- set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
- "Component documentation")
- set(CPACK_COMPONENT_DOCUMENTATION_DEPENDS component)
-endif(INSTALL_DOCUMENTATION)
-if(INSTALL_SOURCES)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} sources)
- set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
- set(CPACK_COMPONENT_SOURCES_DESCRIPTION
- "Source files from the component.")
-endif(INSTALL_SOURCES)
-
-IF (WIN32)
-
- # Windows WiX package settings
-
- set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
- set(CPACK_WIX_LANG "ja-jp")
- set(CPACK_RESOURCE_FILE_LICENSE
- "@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
- configure_file(
- "@CMAKE_CURRENT_SOURCE_DIR@/cmake/wix.xsl.in"
- "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-
-
- #
- #
- #
-# 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)
- set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
- if(INSTALL_DOCUMENTATION)
- set(CPACK_NSIS_MENU_LINKS
- "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/html/index.html"
- "Component documentation")
- endif(INSTALL_DOCUMENTATION)
- string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
- "@CMAKE_INSTALL_PREFIX@")
- file(TO_NATIVE_PATH "${install_prefix_root}" install_prefix_root)
- set(CPACK_NSIS_INSTALL_ROOT "${install_prefix_root}")
- set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
- " Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
- Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config-version.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
- 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)
-
+set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
+set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
+set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
+set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
+set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
+set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
+
+set(CPACK_COMPONENTS_ALL component)
+set(CPACK_COMPONENT_COMPONENT_DISPLAY_NAME "Applications")
+set(CPACK_COMPONENT_COMPONENT_DESCRIPTION
+ "Component library and stand-alone executable")
+if(INSTALL_HEADERS)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} headers)
+ set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
+ set(CPACK_COMPONENT_HEADERS_DESCRIPTION
+ "Header files from the component.")
+ set(CPACK_COMPONENT_HEADERS_DEPENDS component)
+endif(INSTALL_HEADERS)
+if(INSTALL_IDL)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} idl)
+ set(CPACK_COMPONENT_IDL_DISPLAY_NAME "IDL files")
+ set(CPACK_COMPONENT_IDL_DESCRIPTION
+ "IDL files for the component's services.")
+ set(CPACK_COMPONENT_IDL_DEPENDS component)
+endif(INSTALL_IDL)
+set(INSTALL_EXAMPLES @BUILD_EXAMPLES@)
+if(INSTALL_EXAMPLES)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} examples)
+ set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
+ set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION
+ "Sample configuration files and other component resources.")
+ set(CPACK_COMPONENT_EXAMPLES_DEPENDS component)
+endif(INSTALL_EXAMPLES)
+set(INSTALL_DOCUMENTATION @BUILD_DOCUMENTATION@)
+if(INSTALL_DOCUMENTATION)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} documentation)
+ set(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
+ "Component documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DEPENDS component)
+endif(INSTALL_DOCUMENTATION)
+if(INSTALL_SOURCES)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} sources)
+ set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
+ set(CPACK_COMPONENT_SOURCES_DESCRIPTION
+ "Source files from the component.")
+endif(INSTALL_SOURCES)
+
+IF (WIN32)
+
+ # Windows WiX package settings
+
+ set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
+ set(CPACK_WIX_LANG "ja-jp")
+ set(CPACK_RESOURCE_FILE_LICENSE
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
+ configure_file(
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/wix.xsl.in"
+ "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl" @ONLY)
+
+ set(CPACK_PACKAGE_FILE_NAME
+ "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+
+
+ #
+ #
+ #
+# 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)
+ set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
+ if(INSTALL_DOCUMENTATION)
+ set(CPACK_NSIS_MENU_LINKS
+ "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/html/index.html"
+ "Component documentation")
+ endif(INSTALL_DOCUMENTATION)
+ string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
+ "@CMAKE_INSTALL_PREFIX@")
+ file(TO_NATIVE_PATH "${install_prefix_root}" install_prefix_root)
+ set(CPACK_NSIS_INSTALL_ROOT "${install_prefix_root}")
+ set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
+ " Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
+ Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config-version.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
+ 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: trunk/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibration.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibration.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ImageCalibration/src/ImageCalibration.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "ImageCalibration",
"type_name", "ImageCalibration",
"description", "Image Calibration",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(ImageSubstraction)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "ImageSubstraction version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "ImageSubstraction version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Image substraction conponent")
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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/ImageSubstraction/README.ImageSubstraction
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageSubstraction/README.ImageSubstraction 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ImageSubstraction/README.ImageSubstraction 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=ImageSubstraction
-# --module-desc='Image substraction conponent' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Image substraction conponent' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=control_mode:char:b --config=image_height:int:240 --config=image_width:int:320 --config=threshold_coefficient:double:5.0 --config=constant_threshold:int:20
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: ImageSubstraction
Description: Image substraction conponent
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/ImageSubstraction/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageSubstraction/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ImageSubstraction/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:ImageSubstraction:1.1.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="ImageSubstraction" rtc:updateDate="2013-06-12T08:52:28+09:00" rtc:creationDate="2013-06-12T08:52:28+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Image substraction conponent" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ImageSubstraction"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:ImageSubstraction:1.2.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="ImageSubstraction" rtc:updateDate="2013-06-12T08:52:28+09:00" rtc:creationDate="2013-06-12T08:52:28+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Image substraction conponent" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ImageSubstraction"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/ImageSubstraction/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageSubstraction/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ImageSubstraction/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/ImageSubstraction/src/ImageSubstraction.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageSubstraction/src/ImageSubstraction.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ImageSubstraction/src/ImageSubstraction.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "ImageSubstraction",
"type_name", "ImageSubstraction",
"description", "Image substraction conponent",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(MFCamera)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "MFCamera version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "MFCamera version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "USB Camera Acquire 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/MFCamera/README.MFCamera
===================================================================
--- trunk/ImageProcessing/opencv/components/MFCamera/README.MFCamera 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/MFCamera/README.MFCamera 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=MFCamera
-# --module-desc='USB Camera Acquire component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='USB Camera Acquire component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=device_id:int:0 --config=vfmt_id:int:0
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: MFCamera
Description: USB Camera Acquire component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/MFCamera/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/MFCamera/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/MFCamera/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:MFCamera:1.1.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="MFCamera" rtc:updateDate="2014-04-23T09:34:21+09:00" rtc:creationDate="2014-04-23T09:34:21+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="USB Camera Acquire component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="MFCamera">
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:MFCamera:1.2.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="MFCamera" rtc:updateDate="2014-04-23T09:34:21+09:00" rtc:creationDate="2014-04-23T09:34:21+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="USB Camera Acquire component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="MFCamera">
<rtcExt:VersionUpLogs></rtcExt:VersionUpLogs>
</rtc:BasicInfo>
<rtc:Actions>
Modified: trunk/ImageProcessing/opencv/components/MFCamera/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/MFCamera/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/MFCamera/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,98 +1,103 @@
-set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
-set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
-set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
-set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
-set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
-set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
-
-set(CPACK_COMPONENTS_ALL component)
-set(CPACK_COMPONENT_COMPONENT_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_COMPONENT_DESCRIPTION
- "Component library and stand-alone executable")
-if(INSTALL_HEADERS)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} headers)
- set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
- set(CPACK_COMPONENT_HEADERS_DESCRIPTION
- "Header files from the component.")
- set(CPACK_COMPONENT_HEADERS_DEPENDS component)
-endif(INSTALL_HEADERS)
-if(INSTALL_IDL)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} idl)
- set(CPACK_COMPONENT_IDL_DISPLAY_NAME "IDL files")
- set(CPACK_COMPONENT_IDL_DESCRIPTION
- "IDL files for the component's services.")
- set(CPACK_COMPONENT_IDL_DEPENDS component)
-endif(INSTALL_IDL)
-set(INSTALL_EXAMPLES @BUILD_EXAMPLES@)
-if(INSTALL_EXAMPLES)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} examples)
- set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
- set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION
- "Sample configuration files and other component resources.")
- set(CPACK_COMPONENT_EXAMPLES_DEPENDS component)
-endif(INSTALL_EXAMPLES)
-set(INSTALL_DOCUMENTATION @BUILD_DOCUMENTATION@)
-if(INSTALL_DOCUMENTATION)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} documentation)
- set(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
- set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
- "Component documentation")
- set(CPACK_COMPONENT_DOCUMENTATION_DEPENDS component)
-endif(INSTALL_DOCUMENTATION)
-if(INSTALL_SOURCES)
- set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} sources)
- set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
- set(CPACK_COMPONENT_SOURCES_DESCRIPTION
- "Source files from the component.")
-endif(INSTALL_SOURCES)
-
-IF (WIN32)
-
- # Windows WiX package settings
-
- set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
- set(CPACK_WIX_LANG "ja-jp")
- set(CPACK_RESOURCE_FILE_LICENSE
- "@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
- configure_file(
- "@CMAKE_CURRENT_SOURCE_DIR@/cmake/wix.xsl.in"
- "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-
-
- #
- #
- #
-# 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)
- set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
- if(INSTALL_DOCUMENTATION)
- set(CPACK_NSIS_MENU_LINKS
- "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/html/index.html"
- "Component documentation")
- endif(INSTALL_DOCUMENTATION)
- string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
- "@CMAKE_INSTALL_PREFIX@")
- file(TO_NATIVE_PATH "${install_prefix_root}" install_prefix_root)
- set(CPACK_NSIS_INSTALL_ROOT "${install_prefix_root}")
- set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
- " Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
- Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config-version.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
- 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)
-
+set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
+set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
+set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
+set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
+set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
+set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
+
+set(CPACK_COMPONENTS_ALL component)
+set(CPACK_COMPONENT_COMPONENT_DISPLAY_NAME "Applications")
+set(CPACK_COMPONENT_COMPONENT_DESCRIPTION
+ "Component library and stand-alone executable")
+if(INSTALL_HEADERS)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} headers)
+ set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
+ set(CPACK_COMPONENT_HEADERS_DESCRIPTION
+ "Header files from the component.")
+ set(CPACK_COMPONENT_HEADERS_DEPENDS component)
+endif(INSTALL_HEADERS)
+if(INSTALL_IDL)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} idl)
+ set(CPACK_COMPONENT_IDL_DISPLAY_NAME "IDL files")
+ set(CPACK_COMPONENT_IDL_DESCRIPTION
+ "IDL files for the component's services.")
+ set(CPACK_COMPONENT_IDL_DEPENDS component)
+endif(INSTALL_IDL)
+set(INSTALL_EXAMPLES @BUILD_EXAMPLES@)
+if(INSTALL_EXAMPLES)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} examples)
+ set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
+ set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION
+ "Sample configuration files and other component resources.")
+ set(CPACK_COMPONENT_EXAMPLES_DEPENDS component)
+endif(INSTALL_EXAMPLES)
+set(INSTALL_DOCUMENTATION @BUILD_DOCUMENTATION@)
+if(INSTALL_DOCUMENTATION)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} documentation)
+ set(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
+ "Component documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DEPENDS component)
+endif(INSTALL_DOCUMENTATION)
+if(INSTALL_SOURCES)
+ set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} sources)
+ set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
+ set(CPACK_COMPONENT_SOURCES_DESCRIPTION
+ "Source files from the component.")
+endif(INSTALL_SOURCES)
+
+IF (WIN32)
+
+ # Windows WiX package settings
+
+ set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
+ set(CPACK_WIX_LANG "ja-jp")
+ set(CPACK_RESOURCE_FILE_LICENSE
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
+ configure_file(
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/wix.xsl.in"
+ "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl" @ONLY)
+
+ set(CPACK_PACKAGE_FILE_NAME
+ "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+
+
+ #
+ #
+ #
+# 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)
+ set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
+ if(INSTALL_DOCUMENTATION)
+ set(CPACK_NSIS_MENU_LINKS
+ "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/html/index.html"
+ "Component documentation")
+ endif(INSTALL_DOCUMENTATION)
+ string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
+ "@CMAKE_INSTALL_PREFIX@")
+ file(TO_NATIVE_PATH "${install_prefix_root}" install_prefix_root)
+ set(CPACK_NSIS_INSTALL_ROOT "${install_prefix_root}")
+ set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
+ " Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
+ Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config-version.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
+ 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: trunk/ImageProcessing/opencv/components/MFCamera/src/MFCamera.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/MFCamera/src/MFCamera.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/MFCamera/src/MFCamera.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -18,7 +18,7 @@
"implementation_id", "MFCamera",
"type_name", "MFCamera",
"description", "USB Camera Acquire component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "example",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/MFCamera/src/MFUtils.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/MFCamera/src/MFUtils.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/MFCamera/src/MFUtils.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -330,7 +330,7 @@
rgb_image[nCount++]=clip255((298*Y0+516*U0 +128) >> 8);
rgb_image[nCount++]=clip255((298*Y1 + 409*V0+128) >> 8);
- rgb_image[nCount++]=clip255((298*Y1-100*U0-208*V0+128) >> 8);
+ rgb_image[nCount++]=clip255((298*Y1.2.0*U0-208*V0+128) >> 8);
rgb_image[nCount++]=clip255((298*Y1+516*U0 +128) >> 8);
#endif
}
Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(ObjectTracking)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "ObjectTracking version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "ObjectTracking version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Objecttrack 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/README.ObjectTracking
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/README.ObjectTracking 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/README.ObjectTracking 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=ObjectTracking
-# --module-desc='Objecttrack component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Objecttrack component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --inport=img_original:RTC::CameraImage --inport=m_event:RTC::TimedLong --inport=m_x:RTC::TimedLong --inport=m_y:RTC::TimedLong --outport=img_output:RTC::CameraImage --outport=img_hist:RTC::CameraImage
@@ -19,7 +19,7 @@
# <rtc-template block="module">
Module Name: ObjectTracking
Description: Objecttrack component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:ObjectTracking:1.1.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="ObjectTracking" rtc:updateDate="2013-06-12T09:26:16+09:00" rtc:creationDate="2013-06-12T09:26:16+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Objecttrack component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ObjectTracking"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:ObjectTracking:1.2.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="ObjectTracking" rtc:updateDate="2013-06-12T09:26:16+09:00" rtc:creationDate="2013-06-12T09:26:16+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Objecttrack component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="ObjectTracking"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/src/ObjectTracking.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -18,7 +18,7 @@
"implementation_id", "ObjectTracking",
"type_name", "ObjectTracking",
"description", "Objecttrack component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(OpenCVCamera)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "OpenCVCamera version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "OpenCVCamera version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "USB Camera Acquire 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/OpenCVCamera/README.OpenCVCamera
===================================================================
--- trunk/ImageProcessing/opencv/components/OpenCVCamera/README.OpenCVCamera 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/OpenCVCamera/README.OpenCVCamera 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=OpenCVCamera
-# --module-desc='USB Camera Acquire component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='USB Camera Acquire component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=example --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=device_num:int:0
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: OpenCVCamera
Description: USB Camera Acquire component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: example
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/OpenCVCamera/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/OpenCVCamera/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/OpenCVCamera/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:example:OpenCVCamera:1.1.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="OpenCVCamera" rtc:updateDate="2014-03-15T11:25:12.805+09:00" rtc:creationDate="2013-06-12T09:53:05+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="USB Camera Acquire component" rtc:category="example" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="OpenCVCamera"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:example:OpenCVCamera:1.2.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="OpenCVCamera" rtc:updateDate="2014-03-15T11:25:12.805+09:00" rtc:creationDate="2013-06-12T09:53:05+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="USB Camera Acquire component" rtc:category="example" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="OpenCVCamera"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/OpenCVCamera/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/OpenCVCamera/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/OpenCVCamera/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/OpenCVCamera/src/OpenCVCamera.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/OpenCVCamera/src/OpenCVCamera.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/OpenCVCamera/src/OpenCVCamera.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -19,7 +19,7 @@
"implementation_id", "OpenCVCamera",
"type_name", "OpenCVCamera",
"description", "USB Camera Acquire component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "example",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(PGRCamera)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "PGRCamera version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "PGRCamera version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "PGRCamera")
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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/PGRCamera/README.PGRCamera
===================================================================
--- trunk/ImageProcessing/opencv/components/PGRCamera/README.PGRCamera 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/PGRCamera/README.PGRCamera 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=PGRCamera
-# --module-desc='PGRCamera' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='PGRCamera' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=index:int:0
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: PGRCamera
Description: PGRCamera
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/PGRCamera/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/PGRCamera/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/PGRCamera/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:PGRCamera:1.1.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="PGRCamera" rtc:updateDate="2014-03-15T15:11:54.810+09:00" rtc:creationDate="2013-06-12T10:49:15+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="PGRCamera" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="PGRCamera"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:PGRCamera:1.2.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="PGRCamera" rtc:updateDate="2014-03-15T15:11:54.810+09:00" rtc:creationDate="2013-06-12T10:49:15+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="PGRCamera" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="PGRCamera"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/PGRCamera/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/PGRCamera/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/PGRCamera/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/PGRCamera/src/PGRCamera.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/PGRCamera/src/PGRCamera.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/PGRCamera/src/PGRCamera.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -18,7 +18,7 @@
"implementation_id", "PGRCamera",
"type_name", "PGRCamera",
"description", "PGRCamera",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Perspective)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Perspective version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Perspective version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Perspective 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Perspective/README.Perspective
===================================================================
--- trunk/ImageProcessing/opencv/components/Perspective/README.Perspective 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Perspective/README.Perspective 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Perspective
-# --module-desc='Perspective image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Perspective image component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --inport=original_image:RTC::CameraImage --outport=out_image:RTC::CameraImage
@@ -19,7 +19,7 @@
# <rtc-template block="module">
Module Name: Perspective
Description: Perspective image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Perspective/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Perspective/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Perspective/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Perspective:1.1.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="Perspective" rtc:updateDate="2013-06-12T10:30:50+09:00" rtc:creationDate="2013-06-12T10:30:50+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Perspective image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Perspective"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Perspective:1.2.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="Perspective" rtc:updateDate="2013-06-12T10:30:50+09:00" rtc:creationDate="2013-06-12T10:30:50+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Perspective image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Perspective"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Perspective/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Perspective/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Perspective/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Perspective/src/Perspective.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Perspective/src/Perspective.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Perspective/src/Perspective.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "Perspective",
"type_name", "Perspective",
"description", "Perspective image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
@@ -160,7 +160,7 @@
// 変換前の画像での座標
const cv::Point2f src_pt[] = {
cv::Point2f(88.0, 81.0),
- cv::Point2f(111.0, 436.0),
+ cv::Point2f(1.2.0, 436.0),
cv::Point2f(420.0, 346.0),
cv::Point2f(424, 131) };
Modified: trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(RockPaperScissors)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "RockPaperScissors version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "RockPaperScissors version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "RockpaperScissors check compoenet")
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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/RockPaperScissors/README.RockPaperScissors
===================================================================
--- trunk/ImageProcessing/opencv/components/RockPaperScissors/README.RockPaperScissors 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/RockPaperScissors/README.RockPaperScissors 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=RockPaperScissors
-# --module-desc='RockpaperScissors check compoenet' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='RockpaperScissors check compoenet' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=rock_max:double:1.0 --config=rock_min:double:0.85 --config=scissor_max:double:0.85 --config=scissor_min:double:0.7 --config=paper_max:double:0.7 --config=paper_min:double:0.5 --config=iterations:int:4 --config=out_mode:int:1
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: RockPaperScissors
Description: RockpaperScissors check compoenet
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/RockPaperScissors/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/RockPaperScissors/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/RockPaperScissors/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:RockPaperScissors:1.1.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="RockPaperScissors" rtc:updateDate="2014-03-16T17:33:50.273+09:00" rtc:creationDate="2013-06-12T15:40:51+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="RockpaperScissors check compoenet" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="RockPaperScissors"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:RockPaperScissors:1.2.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="RockPaperScissors" rtc:updateDate="2014-03-16T17:33:50.273+09:00" rtc:creationDate="2013-06-12T15:40:51+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="RockpaperScissors check compoenet" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="RockPaperScissors"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/RockPaperScissors/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/RockPaperScissors/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/RockPaperScissors/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/RockPaperScissors/src/RockPaperScissors.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/RockPaperScissors/src/RockPaperScissors.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/RockPaperScissors/src/RockPaperScissors.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -21,7 +21,7 @@
"implementation_id", "RockPaperScissors",
"type_name", "RockPaperScissors",
"description", "RockpaperScissors check compoenet",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Rotate)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Rotate version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Rotate version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Rotate 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Rotate/README.Rotate
===================================================================
--- trunk/ImageProcessing/opencv/components/Rotate/README.Rotate 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Rotate/README.Rotate 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Rotate
-# --module-desc='Rotate image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Rotate image component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=rotate_angle:double:60 --config=scale:double:0.8
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Rotate
Description: Rotate image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Rotate/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Rotate/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Rotate/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Rotate:1.1.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="Rotate" rtc:updateDate="2014-03-16T18:25:11.749+09:00" rtc:creationDate="2013-06-12T17:29:16+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Rotate image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Rotate"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Rotate:1.2.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="Rotate" rtc:updateDate="2014-03-16T18:25:11.749+09:00" rtc:creationDate="2013-06-12T17:29:16+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Rotate image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Rotate"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Rotate/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Rotate/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Rotate/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Rotate/src/Rotate.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Rotate/src/Rotate.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Rotate/src/Rotate.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "Rotate",
"type_name", "Rotate",
"description", "Rotate image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Scale)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Scale version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Scale version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Scale 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Scale/README.Scale
===================================================================
--- trunk/ImageProcessing/opencv/components/Scale/README.Scale 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Scale/README.Scale 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Scale
-# --module-desc='Scale image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Scale image component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=output_scale_x:double:1.0 --config=output_scale_y:double:1.0
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Scale
Description: Scale image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Scale/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Scale/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Scale/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Scale:1.1.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="Scale" rtc:updateDate="2013-06-12T17:43:49+09:00" rtc:creationDate="2013-06-12T17:43:49+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Scale image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Scale"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Scale:1.2.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="Scale" rtc:updateDate="2013-06-12T17:43:49+09:00" rtc:creationDate="2013-06-12T17:43:49+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Scale image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Scale"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Scale/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Scale/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Scale/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Scale/src/Scale.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Scale/src/Scale.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Scale/src/Scale.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "Scale",
"type_name", "Scale",
"description", "Scale image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Sepia)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Sepia version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Sepia version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Sepia 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Sepia/README.Sepia
===================================================================
--- trunk/ImageProcessing/opencv/components/Sepia/README.Sepia 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Sepia/README.Sepia 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Sepia
-# --module-desc='Sepia component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Sepia component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=image_hue:int:22 --config=image_Saturation:int:90
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Sepia
Description: Sepia component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Sepia/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Sepia/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Sepia/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Sepia:1.1.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="Sepia" rtc:updateDate="2013-06-13T08:53:24+09:00" rtc:creationDate="2013-06-13T08:53:24+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Sepia component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Sepia"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Sepia:1.2.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="Sepia" rtc:updateDate="2013-06-13T08:53:24+09:00" rtc:creationDate="2013-06-13T08:53:24+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Sepia component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Sepia"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Sepia/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Sepia/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Sepia/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Sepia/src/Sepia.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Sepia/src/Sepia.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Sepia/src/Sepia.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "Sepia",
"type_name", "Sepia",
"description", "Sepia component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(SubStractCaptureImage)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "SubStractCaptureImage version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "SubStractCaptureImage version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "SubStractCaptureImage 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/SubStractCaptureImage/README.SubStractCaptureImage
===================================================================
--- trunk/ImageProcessing/opencv/components/SubStractCaptureImage/README.SubStractCaptureImage 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/SubStractCaptureImage/README.SubStractCaptureImage 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=SubStractCaptureImage
-# --module-desc='SubStractCaptureImage component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='SubStractCaptureImage component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --inport=original_image:RTC::CameraImage --outport=output_image:RTC::CameraImage --outport=foreMaskImg:RTC::CameraImage --outport=stillMaskImg:RTC::CameraImage --outport=backGroundImg:RTC::CameraImage --outport=stillImg:RTC::CameraImage
@@ -19,7 +19,7 @@
# <rtc-template block="module">
Module Name: SubStractCaptureImage
Description: SubStractCaptureImage component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/SubStractCaptureImage/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/SubStractCaptureImage/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/SubStractCaptureImage/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:SubStractCaptureImage:1.1.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="SubStractCaptureImage" rtc:updateDate="2014-03-17T15:59:00.947+09:00" rtc:creationDate="2013-06-13T09:14:28+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="SubStractCaptureImage component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="SubStractCaptureImage">
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:SubStractCaptureImage:1.2.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="SubStractCaptureImage" rtc:updateDate="2014-03-17T15:59:00.947+09:00" rtc:creationDate="2013-06-13T09:14:28+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="SubStractCaptureImage component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="SubStractCaptureImage">
<rtcExt:VersionUpLogs></rtcExt:VersionUpLogs>
</rtc:BasicInfo>
<rtc:Actions>
Modified: trunk/ImageProcessing/opencv/components/SubStractCaptureImage/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/SubStractCaptureImage/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/SubStractCaptureImage/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/SubStractCaptureImage/src/SubStractCaptureImage.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/SubStractCaptureImage/src/SubStractCaptureImage.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/SubStractCaptureImage/src/SubStractCaptureImage.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "SubStractCaptureImage",
"type_name", "SubStractCaptureImage",
"description", "SubStractCaptureImage component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Template)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Template version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Template version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Template 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Template/README.Template
===================================================================
--- trunk/ImageProcessing/opencv/components/Template/README.Template 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Template/README.Template 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Template
-# --module-desc='Template image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Template image component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=image_path:char:template.bmp
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Template
Description: Template image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Template/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Template/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Template/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Template:1.1.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="Template" rtc:updateDate="2013-06-13T09:41:43+09:00" rtc:creationDate="2013-06-13T09:41:43+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Template image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Template"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Template:1.2.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="Template" rtc:updateDate="2013-06-13T09:41:43+09:00" rtc:creationDate="2013-06-13T09:41:43+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Template image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Template"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Template/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Template/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Template/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Template/src/Template.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Template/src/Template.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Template/src/Template.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -18,7 +18,7 @@
"implementation_id", "Template",
"type_name", "Template",
"description", "Template image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
Modified: trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,15 +5,31 @@
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
-set(LINUX_PACKAGE_GENERATOR "DEB")
-#set(LINUX_PACKAGE_GENERATOR "RPM")
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
# component settings
set(RTC_NAME "${PROJECT_NAME}")
-set(RTC_VERSION "1.1.0")
+set(RTC_VERSION "1.2.0")
set(RTC_VERSION_MAJOR "1")
-set(RTC_VERSION_MINOR "1")
+set(RTC_VERSION_MINOR "2")
set(RTC_VERSION_PATCH "0")
set(RTC_LANG "python")
set(RTC_DESCRIPTION "Image Calibration GUI")
@@ -60,8 +76,8 @@
# set($ENV{PATH} $ENV{PATH} "${OPENRTM_DIR}/bin")
# set install path prefix
# set(CMAKE_INSTALL_PREFIX "${OPENRTM_DIR}")
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
- set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${RTC_LANG}/${PACKAGE_NAME}${PACKAGE_VERSION}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${RTC_VERSION_MAJOR}.${RTC_VERSION_MINOR}")
+ set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${RTC_LANG}/${RTC_NAME}")
endif()
@@ -125,6 +141,7 @@
# package settings
set(CPACK_PACKAGE_NAME "${RTC_NAME}")
+string(TOLOWER ${CPACK_PACKAGE_NAME} CPACK_PACKAGE_NAME_LOWER)
set(CPACK_PACKAGE_VERSION_MAJOR "${RTC_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${RTC_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${RTC_VERSION_PATCH}")
@@ -169,37 +186,15 @@
else()
set(CPACK_GENERATOR "${LINUX_PACKAGE_GENERATOR}")
+ if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWER}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
- if(CPACK_GENERATOR STREQUAL "DEB")
- # Linux Debian package settings
-
- set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
- set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
- set(CPACK_DEBIAN_PACKAGE_SECTION "main")
- set(CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
- set(CPACK_DEBIAN_PACKAGE_DEPENDS "openrtm-aist (>= 1.0.0)")
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${OPENRTM_VERSION}-${PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-
- elseif(CPACK_GENERATOR STREQUAL "RPM")
- # Linux RPM package settings
-
- set(CPACK_RPM_PACKAGE_RELEASE "1.fc10")
- set(CPACK_RPM_PACKAGE_ARCHITECTURE "i386")
- set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
- set(CPACK_RPM_PACKAGE_LICENSE "LGPL")
- set(CPACK_RPM_PACKAGE_REQUIRES "OpenRTM-aist >= 1.0.0")
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${OPENRTM_VERSION}-${PACKAGE_NAME}-${PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
-
- endif()
endif()
-message(STATUS "Package type: ${CPACK_GENERATOR}")
-message(STATUS "Package name: ${CPACK_PACKAGE_FILE_NAME}")
-
include(CPack)
if (SolutionDir)
Modified: trunk/ImageProcessing/opencv/components/TkCalibGUI/README.TkCalibGUI
===================================================================
--- trunk/ImageProcessing/opencv/components/TkCalibGUI/README.TkCalibGUI 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/TkCalibGUI/README.TkCalibGUI 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bpython --module-name=TkCalibGUI
-# --module-desc='Image Calibration GUI' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Image Calibration GUI' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --inport=checker_image:RTC::CameraImage
@@ -21,7 +21,7 @@
# <rtc-template block="module">
Module Name: TkCalibGUI
Description: Image Calibration GUI
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/TkCalibGUI/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/TkCalibGUI/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/TkCalibGUI/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:TkCalibGUI:1.1.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="TkCalibGUI" rtc:updateDate="2013-12-25T14:29:57+09:00" rtc:creationDate="2013-12-06T13:01:38+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Image Calibration GUI" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="TkCalibGUI"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:TkCalibGUI:1.2.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="TkCalibGUI" rtc:updateDate="2013-12-25T14:29:57+09:00" rtc:creationDate="2013-12-06T13:01:38+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Image Calibration GUI" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="TkCalibGUI"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/TkCalibGUI/TkCalibGUIComp.py
===================================================================
--- trunk/ImageProcessing/opencv/components/TkCalibGUI/TkCalibGUIComp.py 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/TkCalibGUI/TkCalibGUIComp.py 2017-02-10 07:26:14 UTC (rev 186)
@@ -121,7 +121,7 @@
tkcalibgui_spec = ["implementation_id", "TkCalibGUI",
"type_name", "TkCalibGUI",
"description", "Image Calibration GUI",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "STATIC",
Modified: trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,29 +1,47 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0002 OLD)
project(Translate)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 1.1.0 CACHE STRING "Translate version")
+set(PROJECT_VERSION 1.2.0 CACHE STRING "Translate version")
DISSECT_VERSION()
set(PROJECT_DESCRIPTION "Translate 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")
-
+if(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+ find_program(DPKG_CMD dpkg)
+ if(DPKG_CMD)
+ set(LINUX_PACKAGE_GENERATOR "DEB")
+ execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "dpkg is found. arch = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+ endif(DPKG_CMD)
+
+ find_program(RPM_CMD rpmbuild)
+ if(RPM_CMD)
+ set(LINUX_PACKAGE_GENERATOR "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "rpmbuild is found. arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ endif(RPM_CMD)
+endif(NOT WIN32 AND NOT LINUX_PACKAGE_GENERATOR)
+
+set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
+set(PROJECT_TYPE "c++/opencv-rtcs")
+
# 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
+ADD_CUSTOM_TARGET (${PROJECT_NAME}_uninstall "${CMAKE_COMMAND}" -P
"${PROJECT_BINARY_DIR}/uninstall_target.cmake")
#option(BUILD_EXAMPLES "Build and install examples" OFF)
-option(BUILD_DOCUMENTATION "Build the documentation" 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)
@@ -43,20 +61,20 @@
# 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)
-
-#set(INC_INSTALL_DIR
-# "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-#set(SHARE_INSTALL_DIR
-# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+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)
+#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})
Modified: trunk/ImageProcessing/opencv/components/Translate/README.Translate
===================================================================
--- trunk/ImageProcessing/opencv/components/Translate/README.Translate 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Translate/README.Translate 2017-02-10 07:26:14 UTC (rev 186)
@@ -7,7 +7,7 @@
This file is generated by rtc-template with the following argments.
# rtc-template -bcxx --module-name=Translate
-# --module-desc='Translate image component' --module-version=1.1.0 --module-vendor=AIST
+# --module-desc='Translate image component' --module-version=1.2.0 --module-vendor=AIST
# --module-category=Category --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=1
# --config=Translate_x:int:50 --config=Translate_y:int:50
@@ -20,7 +20,7 @@
# <rtc-template block="module">
Module Name: Translate
Description: Translate image component
-Version: 1.1.0
+Version: 1.2.0
Vendor: AIST
Category: Category
Kind: DataFlowComponent
Modified: trunk/ImageProcessing/opencv/components/Translate/RTC.xml
===================================================================
--- trunk/ImageProcessing/opencv/components/Translate/RTC.xml 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Translate/RTC.xml 2017-02-10 07:26:14 UTC (rev 186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Translate:1.1.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="Translate" rtc:updateDate="2013-06-13T10:01:54+09:00" rtc:creationDate="2013-06-13T10:01:54+09:00" rtc:version="1.1.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Translate image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Translate"/>
+<rtc:RtcProfile rtc:version="0.2" rtc:id="RTC:AIST:Category:Translate:1.2.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="Translate" rtc:updateDate="2013-06-13T10:01:54+09:00" rtc:creationDate="2013-06-13T10:01:54+09:00" rtc:version="1.2.0" rtc:vendor="AIST" rtc:maxInstances="1" rtc:executionType="PeriodicExecutionContext" rtc:executionRate="1000.0" rtc:description="Translate image component" rtc:category="Category" rtc:componentKind="DataFlowComponent" rtc:activityType="PERIODIC" rtc:componentType="STATIC" rtc:name="Translate"/>
<rtc:Actions>
<rtc:OnInitialize xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
<rtc:OnFinalize xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
Modified: trunk/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in 2017-02-10 07:26:14 UTC (rev 186)
@@ -5,7 +5,12 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -68,9 +73,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,9 +95,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@)
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
Modified: trunk/ImageProcessing/opencv/components/Translate/src/Translate.cpp
===================================================================
--- trunk/ImageProcessing/opencv/components/Translate/src/Translate.cpp 2017-02-08 06:11:40 UTC (rev 185)
+++ trunk/ImageProcessing/opencv/components/Translate/src/Translate.cpp 2017-02-10 07:26:14 UTC (rev 186)
@@ -16,7 +16,7 @@
"implementation_id", "Translate",
"type_name", "Translate",
"description", "Translate image component",
- "version", "1.1.0",
+ "version", "1.2.0",
"vendor", "AIST",
"category", "Category",
"activity_type", "PERIODIC",
More information about the openrtm-commit
mailing list