[openrtm-commit:00383] r58 - in trunk/ImageProcessing/opencv/components: Affine BackGroundSubtractionSimple Binarization CameraViewer Chromakey Dilationerosion DirectShowCam Edge Findcontour Flip Histogram Houghline ImageCalibration ImageSubstraction ObjectTracking OpenCVCamera PGRCamera Perspective RockPaperScissors Rotate Scale Sepia SubStractCaptureImage Template Translate
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 9月 2日 (金) 09:18:30 JST
Author: fsi-katami
Date: 2011-09-02 09:18:30 +0900 (Fri, 02 Sep 2011)
New Revision: 58
Modified:
trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt
trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt
trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt
trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt
trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt
trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt
trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt
trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt
Log:
Corrected not to include RTC.xml.
Modified: trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -47,7 +47,7 @@
set(EXEC_SRCS AffineComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Affine.conf rtc.conf)
+ Affine.conf rtc.conf)
# check OpenRTM installed
@@ -177,8 +177,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -188,16 +186,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS BackGroundSubtractionSimpleComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml BackGroundSubtractionSimple.conf rtc.conf)
+ BackGroundSubtractionSimple.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS BinarizationComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Binarization.conf rtc.conf)
+ Binarization.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS CameraViewerComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml CameraViewer.conf rtc.conf)
+ CameraViewer.conf rtc.conf)
# check OpenRTM installed
@@ -62,10 +62,10 @@
list(APPEND LIBRARIES ${OMNIORB_LIBRARIES} ${OPENRTM_LIBRARIES})
# check doxygen installed
-find_package(Doxygen)
-if(DOXYGEN_FOUND STREQUAL "NO")
- message(FATAL_ERROR "Doxygen not found.")
-endif()
+#find_package(Doxygen)
+#if(DOXYGEN_FOUND STREQUAL "NO")
+# message(FATAL_ERROR "Doxygen not found.")
+#endif()
if(WIN32)
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
@@ -221,80 +220,80 @@
# package settings
-set(CPACK_PACKAGE_NAME "${RTC_NAME}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${RTC_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${RTC_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${RTC_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_VENDOR "${RTC_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${RTC_DESCRIPTION}")
-set(CPACK_PACKAGE_CONTACT "${RTC_MAINTAINER}")
-
-set(CPACK_RESOURCE_FILE_LICENSE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
-set(CPACK_PACKAGE_DESCRIPTION_FILE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
-
-set(CPACK_COMPONENTS_ALL applications documents sources)
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
-set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
-
-set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
-set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
-set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
-
-set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
-set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
-set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
-
-if(WIN32)
- set(CPACK_GENERATOR "WIX")
-
- # 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@/cpack_resources/License.rtf")
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
- "${CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${OPENRTM_VERSION}-${PACKAGE_NAME}${PACKAGE_VERSION}")
-
-else()
- set(CPACK_GENERATOR "${LINUX_PACKAGE_GENERATOR}")
-
- if(CPACK_GENERATOR STREQUAL "DEB")
- # Linux Debian package settings
-
- set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}-1")
- 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)
+#set(CPACK_PACKAGE_NAME "${RTC_NAME}")
+#set(CPACK_PACKAGE_VERSION_MAJOR "${RTC_VERSION_MAJOR}")
+#set(CPACK_PACKAGE_VERSION_MINOR "${RTC_VERSION_MINOR}")
+#set(CPACK_PACKAGE_VERSION_PATCH "${RTC_VERSION_PATCH}")
+#set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+#set(CPACK_PACKAGE_VENDOR "${RTC_VENDOR}")
+#set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${RTC_DESCRIPTION}")
+#set(CPACK_PACKAGE_CONTACT "${RTC_MAINTAINER}")
+#
+#set(CPACK_RESOURCE_FILE_LICENSE
+# "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
+#set(CPACK_PACKAGE_DESCRIPTION_FILE
+# "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
+#
+#set(CPACK_COMPONENTS_ALL applications documents sources)
+#set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
+#set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
+#set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
+#
+#set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
+#set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
+#set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
+#
+#set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
+#set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
+#set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
+#
+#if(WIN32)
+# set(CPACK_GENERATOR "WIX")
+#
+# # 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@/cpack_resources/License.rtf")
+# configure_file(
+# "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
+# "${CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
+#
+# set(CPACK_PACKAGE_FILE_NAME
+# "rtc${OPENRTM_VERSION}-${PACKAGE_NAME}${PACKAGE_VERSION}")
+#
+#else()
+# set(CPACK_GENERATOR "${LINUX_PACKAGE_GENERATOR}")
+#
+# if(CPACK_GENERATOR STREQUAL "DEB")
+# # Linux Debian package settings
+#
+# set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}-1")
+# 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)
Modified: trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS ChromakeyComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Chromakey.conf rtc.conf)
+ Chromakey.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-project(Dilationerosion)
+project(DilationErosion)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
@@ -16,7 +16,7 @@
set(RTC_VERSION_MINOR "0")
set(RTC_VERSION_PATCH "0")
set(RTC_LANG "c++")
-set(RTC_DESCRIPTION "Dilationerosion Agent Component")
+set(RTC_DESCRIPTION "DilationErosion Agent Component")
set(RTC_VENDOR "Shibaura Inst. of Tech, Tanaka & Fujita & Takasu")
set(RTC_MAINTAINER "author at example.com")
@@ -42,14 +42,14 @@
# WiiInfoSVC_impl.h
)
-set(LIBS_SRCS Dilationerosion.cpp)
+set(LIBS_SRCS DilationErosion.cpp)
-set(LIBS_INCS Dilationerosion.h)
+set(LIBS_INCS DilationErosion.h)
-set(EXEC_SRCS DilationerosionComp.cpp)
+set(EXEC_SRCS DilationErosionComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Dilationerosion.conf rtc.conf)
+ DilationErosion.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS DirectShowCamComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml DirectShowCam.conf rtc.conf)
+ DirectShowCam.conf rtc.conf)
# check OpenRTM installed
@@ -183,8 +183,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -194,16 +192,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS EdgeComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Edge.conf rtc.conf)
+ Edge.conf rtc.conf)
# check OpenRTM installed
@@ -62,10 +62,10 @@
list(APPEND LIBRARIES ${OMNIORB_LIBRARIES} ${OPENRTM_LIBRARIES})
# check doxygen installed
-find_package(Doxygen)
-if(DOXYGEN_FOUND STREQUAL "NO")
- message(FATAL_ERROR "Doxygen not found.")
-endif()
+#find_package(Doxygen)
+#if(DOXYGEN_FOUND STREQUAL "NO")
+# message(FATAL_ERROR "Doxygen not found.")
+#endif()
if(WIN32)
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
@@ -220,81 +219,3 @@
COMPONENT "sources")
-# package settings
-set(CPACK_PACKAGE_NAME "${RTC_NAME}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${RTC_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${RTC_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${RTC_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_VENDOR "${RTC_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${RTC_DESCRIPTION}")
-set(CPACK_PACKAGE_CONTACT "${RTC_MAINTAINER}")
-
-set(CPACK_RESOURCE_FILE_LICENSE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
-set(CPACK_PACKAGE_DESCRIPTION_FILE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
-
-set(CPACK_COMPONENTS_ALL applications documents sources)
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
-set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
-
-set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
-set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
-set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
-
-set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
-set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
-set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
-
-if(WIN32)
- set(CPACK_GENERATOR "WIX")
-
- # 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@/cpack_resources/License.rtf")
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
- "${CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${OPENRTM_VERSION}-${PACKAGE_NAME}${PACKAGE_VERSION}")
-
-else()
- set(CPACK_GENERATOR "${LINUX_PACKAGE_GENERATOR}")
-
- if(CPACK_GENERATOR STREQUAL "DEB")
- # Linux Debian package settings
-
- set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}-1")
- 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)
Modified: trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS FindcontourComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Findcontour.conf rtc.conf)
+ Findcontour.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+##get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
@@ -219,82 +218,3 @@
DESTINATION "${INSTALL_PREFIX}/src"
COMPONENT "sources")
-
-# package settings
-set(CPACK_PACKAGE_NAME "${RTC_NAME}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${RTC_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${RTC_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${RTC_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_VENDOR "${RTC_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${RTC_DESCRIPTION}")
-set(CPACK_PACKAGE_CONTACT "${RTC_MAINTAINER}")
-
-set(CPACK_RESOURCE_FILE_LICENSE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
-set(CPACK_PACKAGE_DESCRIPTION_FILE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
-
-set(CPACK_COMPONENTS_ALL applications documents sources)
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
-set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
-
-set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
-set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
-set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
-
-set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
-set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
-set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
-
-if(WIN32)
- set(CPACK_GENERATOR "WIX")
-
- # 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@/cpack_resources/License.rtf")
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
- "${CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${OPENRTM_VERSION}-${PACKAGE_NAME}${PACKAGE_VERSION}")
-
-else()
- set(CPACK_GENERATOR "${LINUX_PACKAGE_GENERATOR}")
-
- if(CPACK_GENERATOR STREQUAL "DEB")
- # Linux Debian package settings
-
- set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}-1")
- 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)
Modified: trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS FlipComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Flip.conf rtc.conf)
+ Flip.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS HistogramComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Histogram.conf rtc.conf)
+ Histogram.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS HoughComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Hough.conf rtc.conf)
+ Hough.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
@@ -220,81 +219,3 @@
COMPONENT "sources")
-# package settings
-set(CPACK_PACKAGE_NAME "${RTC_NAME}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${RTC_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${RTC_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${RTC_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_VENDOR "${RTC_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${RTC_DESCRIPTION}")
-set(CPACK_PACKAGE_CONTACT "${RTC_MAINTAINER}")
-
-set(CPACK_RESOURCE_FILE_LICENSE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
-set(CPACK_PACKAGE_DESCRIPTION_FILE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
-
-set(CPACK_COMPONENTS_ALL applications documents sources)
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
-set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
-
-set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
-set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
-set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
-
-set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
-set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
-set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
-
-if(WIN32)
- set(CPACK_GENERATOR "WIX")
-
- # 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@/cpack_resources/License.rtf")
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
- "${CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${OPENRTM_VERSION}-${PACKAGE_NAME}${PACKAGE_VERSION}")
-
-else()
- set(CPACK_GENERATOR "${LINUX_PACKAGE_GENERATOR}")
-
- if(CPACK_GENERATOR STREQUAL "DEB")
- # Linux Debian package settings
-
- set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}-1")
- 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)
Modified: trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS ImageCalibrationComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml ImageCalibration.conf rtc.conf)
+ ImageCalibration.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS ImageSubstractionComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml ImageSubstraction.conf rtc.conf)
+ ImageSubstraction.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS ObjectTrackingComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml ObjectTracking.conf rtc.conf)
+ ObjectTracking.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS OpenCVCameraComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml OpenCVCamera.conf rtc.conf)
+ OpenCVCamera.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
@@ -220,81 +219,3 @@
COMPONENT "sources")
-# package settings
-set(CPACK_PACKAGE_NAME "${RTC_NAME}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${RTC_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${RTC_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${RTC_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_VENDOR "${RTC_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${RTC_DESCRIPTION}")
-set(CPACK_PACKAGE_CONTACT "${RTC_MAINTAINER}")
-
-set(CPACK_RESOURCE_FILE_LICENSE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
-set(CPACK_PACKAGE_DESCRIPTION_FILE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
-
-set(CPACK_COMPONENTS_ALL applications documents sources)
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
-set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
-
-set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
-set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
-set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
-
-set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
-set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
-set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
-
-if(WIN32)
- set(CPACK_GENERATOR "WIX")
-
- # 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@/cpack_resources/License.rtf")
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
- "${CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${OPENRTM_VERSION}-${PACKAGE_NAME}${PACKAGE_VERSION}")
-
-else()
- set(CPACK_GENERATOR "${LINUX_PACKAGE_GENERATOR}")
-
- if(CPACK_GENERATOR STREQUAL "DEB")
- # Linux Debian package settings
-
- set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}-1")
- 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)
Modified: trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS PGRCameraComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml PGRCamera.conf rtc.conf)
+ PGRCamera.conf rtc.conf)
# check OpenRTM installed
@@ -159,8 +159,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -170,16 +168,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS PerspectiveComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Perspective.conf rtc.conf)
+ Perspective.conf rtc.conf)
# check OpenRTM installed
@@ -180,8 +180,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -191,16 +189,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS RockPaperScissorsComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml RockPaperScissors.conf rtc.conf)
+ RockPaperScissors.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
@@ -220,81 +219,3 @@
COMPONENT "sources")
-# package settings
-set(CPACK_PACKAGE_NAME "${RTC_NAME}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${RTC_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${RTC_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${RTC_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_VENDOR "${RTC_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${RTC_DESCRIPTION}")
-set(CPACK_PACKAGE_CONTACT "${RTC_MAINTAINER}")
-
-set(CPACK_RESOURCE_FILE_LICENSE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
-set(CPACK_PACKAGE_DESCRIPTION_FILE
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
-
-set(CPACK_COMPONENTS_ALL applications documents sources)
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
-set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
-
-set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
-set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
-set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
-
-set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
-set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
-set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
-
-if(WIN32)
- set(CPACK_GENERATOR "WIX")
-
- # 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@/cpack_resources/License.rtf")
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
- "${CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${OPENRTM_VERSION}-${PACKAGE_NAME}${PACKAGE_VERSION}")
-
-else()
- set(CPACK_GENERATOR "${LINUX_PACKAGE_GENERATOR}")
-
- if(CPACK_GENERATOR STREQUAL "DEB")
- # Linux Debian package settings
-
- set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}-1")
- 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)
Modified: trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS RotateComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Rotate.conf rtc.conf)
+ Rotate.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS ScaleComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Scale.conf rtc.conf)
+ Scale.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS SepiaComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Sepia.conf rtc.conf)
+ Sepia.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS SubStractCaptureImageComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml SubStractCaptureImage.conf rtc.conf)
+ SubStractCaptureImage.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS TemplateComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Template.conf rtc.conf)
+ Template.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
Modified: trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt 2011-09-01 23:45:48 UTC (rev 57)
+++ trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt 2011-09-02 00:18:30 UTC (rev 58)
@@ -49,7 +49,7 @@
set(EXEC_SRCS TranslateComp.cpp)
set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml Translate.conf rtc.conf)
+ Translate.conf rtc.conf)
# check OpenRTM installed
@@ -179,8 +179,6 @@
COMPONENT "applications")
install(TARGETS ${RTC_NAME}Comp RUNTIME DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
# target settings for document
@@ -190,16 +188,17 @@
add_custom_target(doxygen_${RTC_NAME} COMMAND
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES)
+#set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
+#get_target_property(DOC_TARGET doc TYPE)
+#if(NOT DOC_TARGET)
+# add_custom_target(doc)
+#endif()
+#add_dependencies(doc doxygen)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "documents")
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${INSTALL_PREFIX}"
+# COMPONENT "documents")
# install source files
openrtm-commit メーリングリストの案内