[openrtm-commit:02806] r213 - in tags/RELEASE_1_1_2/ImageProcessing/opencv: . components/Affine components/Affine/cmake components/BackGroundSubtractionSimple components/BackGroundSubtractionSimple/cmake components/Binarization components/Binarization/cmake components/CameraViewer components/CameraViewer/cmake components/Chromakey components/Chromakey/cmake components/Dilationerosion components/Dilationerosion/cmake components/DirectShowCam components/DirectShowCam/BaseClasses components/DirectShowCam/cmake components/Edge components/Edge/cmake components/Findcontour components/Findcontour/cmake components/Flip components/Flip/cmake components/Histogram components/Histogram/cmake components/Houghline components/Houghline/cmake components/ImageCalibration components/ImageCalibration/cmake components/ImageSubstraction components/ImageSubstraction/cmake components/MFCamera components/MFCamera/cmake components/ObjectTracking components/ObjectTracking/cmake components/OpenCVCamera components/OpenCVCamera/cmake components/PGRCamera components/PGRCamera/cmake components/Perspective components/Perspective/cmake components/RockPaperScissors components/RockPaperScissors/cmake components/Rotate components/Rotate/cmake components/Scale components/Scale/cmake components/Sepia components/Sepia/cmake components/SubStractCaptureImage components/SubStractCaptureImage/cmake components/Template components/Template/cmake components/TkCalibGUI components/Translate components/Translate/cmake
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 9月 6日 (水) 13:44:22 JST
Author: kawauchi
Date: 2017-09-06 13:44:22 +0900 (Wed, 06 Sep 2017)
New Revision: 213
Added:
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/postinst.in
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/prerm.in
tags/RELEASE_1_1_2/ImageProcessing/opencv/postinst.in
tags/RELEASE_1_1_2/ImageProcessing/opencv/prerm.in
Removed:
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Affine/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/BackGroundSubtractionSimple/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Binarization/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/CameraViewer/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Chromakey/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Dilationerosion/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/DirectShowCam/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Edge/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Findcontour/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Flip/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Histogram/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Houghline/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageCalibration/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageSubstraction/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/MFCamera/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ObjectTracking/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/OpenCVCamera/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/PGRCamera/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Perspective/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/RockPaperScissors/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Rotate/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Scale/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Sepia/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/SubStractCaptureImage/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Template/cmake/Modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/cmake_modules/
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Translate/cmake/Modules/
Modified:
tags/RELEASE_1_1_2/ImageProcessing/opencv/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/build_linux_package.sh.in
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Affine/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Binarization/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/DirectShowCam/BaseClasses/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Edge/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Flip/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Histogram/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Perspective/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Rotate/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Scale/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Sepia/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Template/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/idlcompile.bat
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Translate/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in
tags/RELEASE_1_1_2/ImageProcessing/opencv/ip-build.bat
Log:
[merge] r191-199 have been merged from trunk.
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-project(ImageProcessing_opencv)
+project(ImageProcessing)
+set(TOP_PROJECT_NAME ${PROJECT_NAME})
+string(TOLOWER ${TOP_PROJECT_NAME} TOP_PROJECT_NAME_LOWER)
SUBDIRS(components)
set(SolutionDir ${PROJECT_SOURCE_DIR})
@@ -56,7 +58,30 @@
endif()
endif()
-configure_file(${SolutionDir}/build_linux_package.sh.in
- ${PROJECT_BINARY_DIR}/build_linux_package.sh
- @ONLY
-)
+if(UNIX)
+ # build linux package script
+ configure_file(${SolutionDir}/build_linux_package.sh.in
+ ${PROJECT_BINARY_DIR}/build_linux_package.sh
+ @ONLY
+ )
+
+ # postinst, prerm settings
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/postinst.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/postinst @ONLY
+ )
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/prerm.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/prerm @ONLY
+ )
+endif()
+
+if(NOT WIN32)
+ if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_SOURCE_DIR}/components/TkCalibGUI/postinst;${PROJECT_SOURCE_DIR}/components/TkCalibGUI/prerm")
+ endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/components/TkCalibGUI/postinst")
+ set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/components/TkCalibGUI/prerm")
+ endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
+endif()
+
+
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/build_linux_package.sh.in
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/build_linux_package.sh.in 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/build_linux_package.sh.in 2017-09-06 04:44:22 UTC (rev 213)
@@ -3,16 +3,11 @@
GENERATOR=@LINUX_PACKAGE_GENERATOR@
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'
+
+rm -f components/Translate/cpack_options.cmake
+
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}
-
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Affine/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Affine/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Affine/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Affine)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(BackGroundSubtractionSimple)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Binarization/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Binarization/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Binarization/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Binarization)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(CameraViewer)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Chromakey)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(DilationErosion)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/DirectShowCam/BaseClasses/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/DirectShowCam/BaseClasses/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/DirectShowCam/BaseClasses/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,4 +1,7 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(BaseClasses)
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(DirectShowCam)
SUBDIRS(BaseClasses)
@@ -111,13 +117,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Edge/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Edge/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Edge/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Edge)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Findcontour)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Flip/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Flip)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Histogram/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Histogram/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Histogram/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Histogram)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Houghline/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Houghline/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Hough)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(ImageCalibration)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(ImageSubstraction)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(MFCamera)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(ObjectTracking)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(OpenCVCamera)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(PGRCamera)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Perspective/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Perspective/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Perspective/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Perspective)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(RockPaperScissors)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Rotate/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Rotate/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Rotate/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Rotate)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Scale/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Scale/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Scale/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Scale)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Sepia/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Sepia/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Sepia/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Sepia)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(SubStractCaptureImage)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Template/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Template/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Template/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Template)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,9 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+if(POLICY CMP0053)
+ cmake_policy(SET CMP0053 OLD)
+endif()
project(TkCalibGUI NONE)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
function(get_dist ARG0)
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -76,16 +78,12 @@
)
set(EXEC_FILES ""
- TkCalibGUIComp.py tkcalibgui.py rtutil.py setup.py
+ TkCalibGUIComp.py tkcalibgui.py rtutil.py setup.py idlcompile.sh
)
set(OTHER_SRCS CMakeLists.txt
RTC.xml TkCalibGUI.conf rtc.conf)
-
-# check OpenRTM installed
-find_package(OpenRTMPython REQUIRED)
-
# check doxygen installed
find_package(Doxygen)
if(DOXYGEN_FOUND STREQUAL "NO")
@@ -94,24 +92,24 @@
# check python installed
find_package(PythonInterp)
-find_package(PythonLibs)
if(WIN32)
- # add command path
-# set($ENV{PATH} $ENV{PATH} "${OPENRTM_DIR}/bin")
- # set install path prefix
-# set(CMAKE_INSTALL_PREFIX "${OPENRTM_DIR}")
set(INSTALL_PREFIX "components/${RTC_LANG}/${PACKAGE_NAME}${PACKAGE_VERSION}")
else()
- # add command path
-# set($ENV{PATH} $ENV{PATH} "${OPENRTM_DIR}/bin")
- # set install path prefix
-# set(CMAKE_INSTALL_PREFIX "${OPENRTM_DIR}")
set(OPENRTM_SHARE_PREFIX "share/openrtm-${RTC_VERSION_MAJOR}.${RTC_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${RTC_LANG}/${RTC_NAME}")
endif()
+# postinst, prerm settings
+if(UNIX)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/postinst.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/postinst @ONLY
+ )
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/prerm.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/prerm @ONLY
+ )
+endif()
# add uninstall target
configure_file(
@@ -138,7 +136,6 @@
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/idl
COMMAND ${CMAKE_COMMAND} -E copy_directory
${PROJECT_SOURCE_DIR}/idl ${PROJECT_BINARY_DIR}/idl
- COMMAND /bin/sh ${PROJECT_SOURCE_DIR}/idlcompile.sh
)
endif()
@@ -152,14 +149,20 @@
install(PROGRAMS ${EXEC_FILES} DESTINATION "${INSTALL_PREFIX}"
COMPONENT "applications")
-install(FILES ${PROJECT_BINARY_DIR}/CalibrationService_idl.py DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
+if(WIN32)
+ install(FILES ${PROJECT_BINARY_DIR}/CalibrationService_idl.py DESTINATION "${INSTALL_PREFIX}"
+ COMPONENT "applications")
-install(DIRECTORY idl
+ install(DIRECTORY idl
${PROJECT_BINARY_DIR}/ImageCalibService
${PROJECT_BINARY_DIR}/ImageCalibService__POA
- DESTINATION "${INSTALL_PREFIX}"
- COMPONENT "applications")
+ DESTINATION "${INSTALL_PREFIX}"
+ COMPONENT "applications")
+else()
+ install(DIRECTORY idl
+ DESTINATION "${INSTALL_PREFIX}"
+ COMPONENT "applications")
+endif()
# install source files
#install(FILES ${IDL_FILES} ${EXEC_FILES} ${OTHER_SRCS}
@@ -174,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}")
@@ -220,9 +224,12 @@
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}")
+ set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/postinst;${CMAKE_SOURCE_DIR}/prerm")
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}")
+ set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/postinst")
+ set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/prerm")
endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
endif()
@@ -229,14 +236,24 @@
include(CPack)
+
+
if (SolutionDir)
- SET (calib_python_file
+ if(WIN32)
+ SET (calib_python_file
${PROJECT_SOURCE_DIR}/TkCalibGUIComp.py
${PROJECT_SOURCE_DIR}/tkcalibgui.py
${PROJECT_SOURCE_DIR}/rtutil.py
${PROJECT_BINARY_DIR}/CalibrationService_idl.py
${PROJECT_BINARY_DIR}/setup.py)
-
+ else()
+ SET (calib_python_file
+ ${PROJECT_SOURCE_DIR}/TkCalibGUIComp.py
+ ${PROJECT_SOURCE_DIR}/tkcalibgui.py
+ ${PROJECT_SOURCE_DIR}/rtutil.py
+ ${PROJECT_BINARY_DIR}/setup.py)
+ endif()
+
foreach(target ${calib_python_file})
add_custom_command(
TARGET ${PROJECT_NAME} POST_BUILD
@@ -245,22 +262,24 @@
)
endforeach()
- SET (calib_python_dir
+ if(WIN32)
+ SET (calib_python_dir
ImageCalibService
ImageCalibService__POA)
- foreach(target ${calib_python_dir})
- add_custom_command(
- TARGET ${PROJECT_NAME} POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E make_directory ${SolutionDir}/bin/${target}
- )
- endforeach()
+ foreach(target ${calib_python_dir})
+ add_custom_command(
+ TARGET ${PROJECT_NAME} POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${SolutionDir}/bin/${target}
+ )
+ endforeach()
- foreach(target ${calib_python_dir})
- add_custom_command(
- TARGET ${PROJECT_NAME} POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${target} ${SolutionDir}/bin/${target}
- )
- endforeach()
+ foreach(target ${calib_python_dir})
+ add_custom_command(
+ TARGET ${PROJECT_NAME} POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${target} ${SolutionDir}/bin/${target}
+ )
+ endforeach()
+ endif()
endif (SolutionDir)
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/idlcompile.bat
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/idlcompile.bat 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/idlcompile.bat 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,9 +1,9 @@
-echo off
+ at echo off
setlocal
for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" -I"/usr/include/openrtm-1.1/rtm/idl" idl/CalibrationService.idl
-) else do (
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" -I"/usr/include/openrtm-1.2/rtm/idl" idl/CalibrationService.idl
+) else (
echo "python.exe" can not be found.
echo Please modify PATH environmental variable for python command.
)
Copied: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/postinst.in (from rev 199, trunk/ImageProcessing/opencv/components/TkCalibGUI/postinst.in)
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/postinst.in (rev 0)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/postinst.in 2017-09-06 04:44:22 UTC (rev 213)
@@ -0,0 +1,5 @@
+#!/bin/sh
+# postinst script
+set -e
+cd /usr/@INSTALL_PREFIX@
+sh idlcompile.sh
Copied: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/prerm.in (from rev 199, trunk/ImageProcessing/opencv/components/TkCalibGUI/prerm.in)
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/prerm.in (rev 0)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/prerm.in 2017-09-06 04:44:22 UTC (rev 213)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# prerm script
+sudo rm -rf /usr/@INSTALL_PREFIX@
+
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Translate/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Translate/CMakeLists.txt 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Translate/CMakeLists.txt 2017-09-06 04:44:22 UTC (rev 213)
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(Translate)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -109,13 +115,6 @@
# Get necessary dependency information
find_package(OpenRTM)
-if(${OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${OpenRTM_FOUND})
# Universal settings
#enable_testing()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Translate/cmake/cpack_options.cmake.in 2017-09-06 04:44:22 UTC (rev 213)
@@ -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@")
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/ip-build.bat
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/ip-build.bat 2017-09-06 04:32:30 UTC (rev 212)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/ip-build.bat 2017-09-06 04:44:22 UTC (rev 213)
@@ -154,7 +154,7 @@
vcbuild /M2 /rebuild components\DirectShowCam\BaseClasses\BaseClasses.sln "release|win32"
vcbuild /M2 /rebuild components\ImageCalibration\idl\InterfaceDataTypes_TGT.vcproj "release|win32"
-vcbuild /M2 /build ImageProcessing_opencv.sln "release|win32"
+vcbuild /M2 /build ImageProcessing.sln "release|win32"
goto MAKE_ZIP
@rem ------------------------------------------------------------
@@ -164,13 +164,13 @@
echo Visual Studio Dir: %VSINSTALLDIR%
echo LIB: %LIB%
set OPT=/M:4 /toolsversion:%VCTOOLSET% %PLATFORMTOOL% /p:platform=Win32
-set SLN=ImageProcessing_opencv.sln
+set SLN=ImageProcessing.sln
set LOG=/fileLogger /flp:logfile=debug.log /v:diag
if %VC_VERSION% == 10 (
msbuild /t:rebuild /p:configuration=release %OPT% components\DirectShowCam\BaseClasses\BaseClasses.sln
)
-
+msbuild /t:build /p:configuration=release %OPT% components\ImageCalibration\idl\ALL_IDL_TGT.vcxproj
msbuild /t:build /p:configuration=release %OPT% %SLN%
goto MAKE_ZIP
@@ -233,7 +233,7 @@
echo LIB: %LIB%
set OPT=/M:4 /toolsversion:%VCTOOLSET% %PLATFORMTOOL% /p:platform=x64
set LOG=/fileLogger /flp:logfile=debug.log /v:diag
-set SLN=ImageProcessing_opencv.sln
+set SLN=ImageProcessing.sln
if %VC_VERSION% == 10 (
msbuild /t:rebuild /p:configuration=release %OPT% components\DirectShowCam\BaseClasses\BaseClasses.sln
Copied: tags/RELEASE_1_1_2/ImageProcessing/opencv/postinst.in (from rev 199, trunk/ImageProcessing/opencv/postinst.in)
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/postinst.in (rev 0)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/postinst.in 2017-09-06 04:44:22 UTC (rev 213)
@@ -0,0 +1,5 @@
+#!/bin/sh
+# postinst script
+set -e
+cd /usr/@INSTALL_PREFIX@
+sh idlcompile.sh
Copied: tags/RELEASE_1_1_2/ImageProcessing/opencv/prerm.in (from rev 199, trunk/ImageProcessing/opencv/prerm.in)
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/prerm.in (rev 0)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/prerm.in 2017-09-06 04:44:22 UTC (rev 213)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# prerm script
+sudo rm -rf /usr/@INSTALL_PREFIX@
+
More information about the openrtm-commit
mailing list