[openrtm-commit:02809] r215 - in tags/RELEASE_1_1_2/ImageProcessing/opencv: . bin components/Affine components/BackGroundSubtractionSimple components/Binarization components/CameraViewer components/Chromakey components/Dilationerosion components/DirectShowCam components/Edge components/Findcontour components/Flip components/Histogram components/Houghline components/ImageCalibration components/ImageSubstraction components/MFCamera components/ObjectTracking components/OpenCVCamera components/PGRCamera components/Perspective components/RockPaperScissors components/Rotate components/Scale components/Sepia components/SubStractCaptureImage components/Template components/TkCalibGUI components/Translate
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 9月 6日 (水) 14:42:30 JST
Author: kawauchi
Date: 2017-09-06 14:42:30 +0900 (Wed, 06 Sep 2017)
New Revision: 215
Modified:
tags/RELEASE_1_1_2/ImageProcessing/opencv/CMakeLists.txt
tags/RELEASE_1_1_2/ImageProcessing/opencv/bin/rtc.conf
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/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/Translate/CMakeLists.txt
Log:
[merge] r209-211 have been merged from trunk. refs #4182
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/CMakeLists.txt
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/CMakeLists.txt 2017-09-06 04:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -49,6 +49,7 @@
OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
OUTPUT_STRIP_TRAILING_WHITESPACE)
message(STATUS "Package manager is ${PKGMGR}. Arch is ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.")
+ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libopencv-dev, libcv2.3|libcv2.4, libcvaux2.3|libcvaux2.4, libhighgui2.3|libhighgui2.4")
endif()
if(${PKGMGR} MATCHES "RPM")
execute_process(COMMAND uname "-m"
@@ -55,6 +56,7 @@
OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
OUTPUT_STRIP_TRAILING_WHITESPACE)
message(STATUS "Package manager is ${PKGMGR}. Arch is ${CPACK_RPM_PACKAGE_ARCHITECTURE}.")
+ set(CPACK_RPM_PACKAGE_REQUIRES "opencv-devel")
endif()
endif()
Modified: tags/RELEASE_1_1_2/ImageProcessing/opencv/bin/rtc.conf
===================================================================
--- tags/RELEASE_1_1_2/ImageProcessing/opencv/bin/rtc.conf 2017-09-06 04:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/bin/rtc.conf 2017-09-06 05:42:30 UTC (rev 215)
@@ -1,2 +1,3 @@
corba.nameservers: localhost
logger.enable: NO
+corba.args: -ORBgiopMaxMsgSize 4194304
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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Affine/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Binarization/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# Universal settings
#enable_testing()
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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -99,6 +99,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -106,7 +108,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -115,9 +117,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Edge/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Histogram/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Houghline/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Perspective/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Rotate/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Scale/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Sepia/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Template/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# 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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -92,12 +92,13 @@
# check python installed
find_package(PythonInterp)
+# Get necessary dependency information
+find_package(OpenRTM)
-
if(WIN32)
set(INSTALL_PREFIX "components/${RTC_LANG}/${PACKAGE_NAME}${PACKAGE_VERSION}")
else()
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${RTC_VERSION_MAJOR}.${RTC_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${RTC_LANG}/${RTC_NAME}")
endif()
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:50:13 UTC (rev 214)
+++ tags/RELEASE_1_1_2/ImageProcessing/opencv/components/Translate/CMakeLists.txt 2017-09-06 05:42:30 UTC (rev 215)
@@ -97,6 +97,8 @@
SET(CMAKE_CXX_COMPILER "g++")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Get necessary dependency information
+find_package(OpenRTM)
# Set up installation directories
if(WIN32)
@@ -104,7 +106,7 @@
# set(LIB_INSTALL_DIR "components/lib")
set(INSTALL_PREFIX "components/${PROJECT_TYPE}")
else(WIN32)
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}")
endif(WIN32)
@@ -113,9 +115,6 @@
#set(SHARE_INSTALL_DIR
# "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
-# Get necessary dependency information
-find_package(OpenRTM)
-
# Universal settings
#enable_testing()
More information about the openrtm-commit
mailing list