[openrtm-commit:02803] r211 - in trunk/ImageProcessing/opencv/components: Affine BackGroundSubtractionSimple Binarization CameraViewer Chromakey Dilationerosion DirectShowCam Edge Findcontour Flip Histogram Houghline ImageCalibration ImageSubstraction MFCamera ObjectTracking OpenCVCamera PGRCamera Perspective RockPaperScissors Rotate Scale Sepia SubStractCaptureImage Template TkCalibGUI Translate
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 9月 5日 (火) 18:22:33 JST
Author: kawauchi
Date: 2017-09-05 18:22:33 +0900 (Tue, 05 Sep 2017)
New Revision: 211
Modified:
trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt
trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt
trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt
trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt
trunk/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt
trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt
trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt
trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt
trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt
trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt
trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt
Log:
[compat,bugfix] Installation path on Linux has been fixed. refs #4180
Modified: trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Affine/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Binarization/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/DirectShowCam/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Edge/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Flip/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Histogram/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Houghline/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/MFCamera/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/PGRCamera/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Perspective/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Rotate/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Scale/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Sepia/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Template/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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: trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt
===================================================================
--- trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt 2017-08-10 06:59:19 UTC (rev 210)
+++ trunk/ImageProcessing/opencv/components/Translate/CMakeLists.txt 2017-09-05 09:22:33 UTC (rev 211)
@@ -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