[openrtm-commit:02492] r199 - in trunk/ImageProcessing/opencv: . components/TkCalibGUI components/Translate/cmake
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 1日 (水) 13:57:08 JST
Author: kawauchi
Date: 2017-03-01 13:57:07 +0900 (Wed, 01 Mar 2017)
New Revision: 199
Removed:
trunk/ImageProcessing/opencv/ip_cpack_options.cmake
Modified:
trunk/ImageProcessing/opencv/build_linux_package.sh.in
trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in
Log:
[compat,bugfix,->RELEASE_1_2_0] fixed bug. refs #3970
Modified: trunk/ImageProcessing/opencv/build_linux_package.sh.in
===================================================================
--- trunk/ImageProcessing/opencv/build_linux_package.sh.in 2017-03-01 00:29:30 UTC (rev 198)
+++ trunk/ImageProcessing/opencv/build_linux_package.sh.in 2017-03-01 04:57:07 UTC (rev 199)
@@ -4,9 +4,9 @@
echo "Linux package generator:" ${GENERATOR}
grep -l 'translate' CPackConfig.cmake | xargs sed -i.bak -e 's/"translate/"imageprocessing/g'
-grep -l 'Translate' CPackConfig.cmake | xargs sed -i.bak -e 's/"Translate/"Imageprocessing/g'
+grep -l 'Translate' CPackConfig.cmake | xargs sed -i.bak -e 's/"Translate/"ImageProcessing/g'
-cp -f ../ip_cpack_options.cmake components/Translate/cpack_options.cmake
+rm -f components/Translate/cpack_options.cmake
cpack -C CPackConfig.cmake
Modified: trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2017-03-01 00:29:30 UTC (rev 198)
+++ trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2017-03-01 04:57:07 UTC (rev 199)
@@ -177,6 +177,7 @@
# package settings
set(CPACK_PACKAGE_NAME "${RTC_NAME}")
string(TOLOWER ${CPACK_PACKAGE_NAME} CPACK_PACKAGE_NAME_LOWER)
+set(CPACK_RPM_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}")
Modified: trunk/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in
===================================================================
--- trunk/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in 2017-03-01 00:29:30 UTC (rev 198)
+++ trunk/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in 2017-03-01 04:57:07 UTC (rev 199)
@@ -1,4 +1,5 @@
set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
+set(CPACK_RPM_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@")
Deleted: trunk/ImageProcessing/opencv/ip_cpack_options.cmake
===================================================================
--- trunk/ImageProcessing/opencv/ip_cpack_options.cmake 2017-03-01 00:29:30 UTC (rev 198)
+++ trunk/ImageProcessing/opencv/ip_cpack_options.cmake 2017-03-01 04:57:07 UTC (rev 199)
@@ -1,103 +0,0 @@
-set(CPACK_PACKAGE_NAME "ImageProcessing")
-set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "2")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ModuleDescription")
-set(CPACK_PACKAGE_VENDOR "VenderName")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "ImageProcessing100")
-if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
- set(CPACK_PACKAGE_FILE_NAME "imageprocessing_1.2.0_amd64")
-endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
-if(CPACK_RPM_PACKAGE_ARCHITECTURE)
- set(CPACK_PACKAGE_FILE_NAME "ImageProcessing-1.2.0-")
-endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
-set(CPACK_RESOURCE_FILE_LICENSE "/home/openrtm/workspace/ImageProcessing/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 )
-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 OFF)
-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 "/home/openrtm/workspace/ImageProcessing/build/wix.xsl")
- set(CPACK_WIX_LANG "ja-jp")
- set(CPACK_RESOURCE_FILE_LICENSE
- "/home/openrtm/workspace/ImageProcessing/cmake/License.rtf")
- configure_file(
- "/home/openrtm/workspace/ImageProcessing/cmake/wix.xsl.in"
- "/home/openrtm/workspace/ImageProcessing/build/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "ImageProcessing100")
-
-
- #
- #
- #
-# set(CPACK_NSIS_MUI_ICON "/home/openrtm/workspace/ImageProcessing/cmake\\rt_middleware_logo.ico")
-# set(CPACK_NSIS_MUI_UNIICON "/home/openrtm/workspace/ImageProcessing/cmake\\rt_middleware_logo.ico")
-# set(CPACK_PACKAGE_ICON "/home/openrtm/workspace/ImageProcessing/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 imageprocessingComp;imageprocessingComp)
- if(INSTALL_DOCUMENTATION)
- set(CPACK_NSIS_MENU_LINKS
- "/usr/local/share/doc/imageprocessing-1/html/index.html"
- "Component documentation")
- endif(INSTALL_DOCUMENTATION)
- string(REPLACE "/ImageProcessing" "" install_prefix_root
- "/usr/local")
- 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\\imageprocessing-1\\imageprocessing-config.cmake\" \"$INSTDIR\\imageprocessing-config.cmake\"
- Rename \"$INSTDIR\\share\\imageprocessing-1\\imageprocessing-config-version.cmake\" \"$INSTDIR\\imageprocessing-config-version.cmake\"")
- set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
- " Delete \"$INSTDIR\\imageprocessing-config.cmake\"
- Delete \"$INSTDIR\\imageprocessing-config-version.cmake\"")
-
-ELSE(WIN32)
- set(CPACK_GENERATOR DEB)
- set(CPACK_PACKAGE_CONTACT unknown)
-ENDIF (WIN32)
-
openrtm-commit メーリングリストの案内