[openrtm-commit:01406] r146 - in branches/newCMakeForVC2010/ImageProcessing/opencv/components: PanasonicRtComponent/src SonyRtComponent/src

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-03-25 17:23:58 +0900 (Tue, 25 Mar 2014)
New Revision: 146

Modified:
   branches/newCMakeForVC2010/ImageProcessing/opencv/components/PanasonicRtComponent/src/CMakeLists.txt
   branches/newCMakeForVC2010/ImageProcessing/opencv/components/SonyRtComponent/src/CMakeLists.txt
Log:
Added process for searching shared library. refs #2704

Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/PanasonicRtComponent/src/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/PanasonicRtComponent/src/CMakeLists.txt	2014-03-25 08:17:49 UTC (rev 145)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/PanasonicRtComponent/src/CMakeLists.txt	2014-03-25 08:23:58 UTC (rev 146)
@@ -70,6 +70,11 @@
 set_source_files_properties(${ALL_IDL_SRCS} PROPERTIES GENERATED 1)
 add_dependencies(${PROJECT_NAME} ALL_IDL_TGT)
 
+find_library(CAMERA_UTIL_LIB
+      NAMES NetworkCameraUtility libNetworkCameraUtility
+      PATHS ${camera_lib_dir}
+    )
+
 target_link_libraries(${PROJECT_NAME} ${OPENRTM_LIBRARIES} ${OpenCV_LIBS} 
           ${CAMERA_UTIL_LIB} ${Boost_LIBRARIES})
 

Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/SonyRtComponent/src/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/SonyRtComponent/src/CMakeLists.txt	2014-03-25 08:17:49 UTC (rev 145)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/SonyRtComponent/src/CMakeLists.txt	2014-03-25 08:23:58 UTC (rev 146)
@@ -63,6 +63,11 @@
 set_source_files_properties(${ALL_IDL_SRCS} PROPERTIES GENERATED 1)
 add_dependencies(${PROJECT_NAME} ALL_IDL_TGT)
 
+find_library(CAMERA_UTIL_LIB
+      NAMES NetworkCameraUtility libNetworkCameraUtility
+	    PATHS ${camera_lib_dir}
+    )
+
 target_link_libraries(${PROJECT_NAME} ${OPENRTM_LIBRARIES} ${OpenCV_LIBS} 
           ${CAMERA_UTIL_LIB})