[openrtm-commit:00177] r38 - in branches/ForVC2010/ImageProcessing/opencv: . components components/Affine components/Affine/cmake_modules components/BackGroundSubtractionSimple components/BackGroundSubtractionSimple/cmake_modules components/Binarization components/Binarization/cmake_modules components/CameraViewer components/CameraViewer/cmake_modules components/Chromakey components/Chromakey/cmake_modules components/Dilationerosion components/Dilationerosion/cmake_modules components/Edge components/Edge/cmake_modules components/Findcontour components/Findcontour/cmake_modules components/Flip components/Flip/cmake_modules components/Histogram components/Histogram/cmake_modules components/Houghline components/Houghline/cmake_modules components/IEEE1394Camera components/IEEE1394Camera/cmake_modules components/ImageCalibration components/ImageCalibration/cmake_modules components/ImageSubstraction components/ImageSubstraction/cmake_modules components/ObjectTracking components/ObjectTracking/cmake_modules components/OpenCVCamera components/OpenCVCamera/cmake_modules components/Perspective components/Perspective/cmake_modules components/RockPaperScissors components/RockPaperScissors/cmake_modules components/Rotate components/Rotate/cmake_modules components/Scale components/Scale/cmake_modules components/Sepia components/Sepia/cmake_modules components/SubStractCaptureImage components/SubStractCaptureImage/cmake_modules components/Template components/Template/cmake_modules components/Translate components/Translate/cmake_modules

openrtm @ openrtm.org openrtm @ openrtm.org
2011年 6月 16日 (木) 12:06:01 JST


Author: fsi-katami
Date: 2011-06-16 12:06:01 +0900 (Thu, 16 Jun 2011)
New Revision: 38

Added:
   branches/ForVC2010/ImageProcessing/opencv/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/CMakeLists.txt
Modified:
   branches/ForVC2010/ImageProcessing/opencv/components/Affine/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Affine/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/BackGroundSubtractionSimple/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Binarization/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Binarization/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/CameraViewer/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Chromakey/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Dilationerosion/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Edge/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Edge/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Findcontour/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Flip/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Flip/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Histogram/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Histogram/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Houghline/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/IEEE1394Camera/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/IEEE1394Camera/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/OpenCVCamera/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Perspective/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Perspective/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/RockPaperScissors/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Rotate/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Rotate/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Scale/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Scale/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Sepia/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Sepia/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Template/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Template/cmake_modules/FindOpenRTM.cmake
   branches/ForVC2010/ImageProcessing/opencv/components/Translate/CMakeLists.txt
   branches/ForVC2010/ImageProcessing/opencv/components/Translate/cmake_modules/FindOpenRTM.cmake
Log:
For vc2010. refs #1915

Added: branches/ForVC2010/ImageProcessing/opencv/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/CMakeLists.txt	                        (rev 0)
+++ branches/ForVC2010/ImageProcessing/opencv/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+
+project(ImageProcessing_opencv)
+#SUBDIRS(rtm components)
+SUBDIRS(components)
+

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Affine/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Affine/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Affine/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -101,12 +101,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Affine/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Affine/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Affine/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/BackGroundSubtractionSimple/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/BackGroundSubtractionSimple/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/BackGroundSubtractionSimple/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/BackGroundSubtractionSimple/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Binarization/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Binarization/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Binarization/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Binarization/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Binarization/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Binarization/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Added: branches/ForVC2010/ImageProcessing/opencv/components/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/CMakeLists.txt	                        (rev 0)
+++ branches/ForVC2010/ImageProcessing/opencv/components/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -0,0 +1,3 @@
+SUBDIRS(Affine BackGroundSubtractionSimple Binarization Chromakey Dilationerosion Edge Findcontour Flip Histogram Houghline ImageCalibration ImageSubstraction ObjectTracking Perspective RockPaperScissors Rotate Scale Sepia SubStractCaptureImage Template Translate OpenCVCamera CameraViewer)
+#SUBDIRS(Affine BackGroundSubtractionSimple Binarization Chromakey Dilationerosion Edge Findcontour Flip Histogram Houghline ImageCalibration ImageSubstraction ObjectTracking PGRCamera Perspective RockPaperScissors Rotate Scale Sepia SubStractCaptureImage Template Translate OpenCVCamera CameraViewer)
+#SUBDIRS(Affine BackGroundSubtractionSimple)

Modified: branches/ForVC2010/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/CameraViewer/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
-project(CameraViewer)
+project(Chromakey)
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
@@ -16,7 +16,7 @@
 set(RTC_VERSION_MINOR "0")
 set(RTC_VERSION_PATCH "0")
 set(RTC_LANG "c++")
-set(RTC_DESCRIPTION "CameraViewer Agent Component")
+set(RTC_DESCRIPTION "Chromakey Agent Component")
 set(RTC_VENDOR "Shibaura Inst. of Tech, Tanaka & Fujita & Takasu")
 set(RTC_MAINTAINER "author at example.com")
 
@@ -42,14 +42,14 @@
 	#              WiiInfoSVC_impl.h
 )
 
-set(LIBS_SRCS CameraViewer.cpp)
+set(LIBS_SRCS Chromakey.cpp)
 
-set(LIBS_INCS CameraViewer.h)
+set(LIBS_INCS Chromakey.h)
 
-set(EXEC_SRCS CameraViewerComp.cpp)
+set(EXEC_SRCS ChromakeyComp.cpp)
 
 set(OTHER_SRCS CMakeLists.txt Doxyfile.in
-               RTC.xml CameraViewer.conf rtc.conf)
+               RTC.xml Chromakey.conf rtc.conf)
 
 
 # check OpenRTM installed
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/CameraViewer/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/CameraViewer/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/CameraViewer/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Chromakey/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Chromakey/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Chromakey/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Chromakey/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Dilationerosion/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Dilationerosion/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Dilationerosion/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Dilationerosion/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Edge/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Edge/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Edge/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Edge/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Edge/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Edge/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Findcontour/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Findcontour/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Findcontour/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Findcontour/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Flip/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Flip/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Flip/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Flip/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Flip/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Flip/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Histogram/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Histogram/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Histogram/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Histogram/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Histogram/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Histogram/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Houghline/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Houghline/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Houghline/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Houghline/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Houghline/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Houghline/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/IEEE1394Camera/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/IEEE1394Camera/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/IEEE1394Camera/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/IEEE1394Camera/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/IEEE1394Camera/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/IEEE1394Camera/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/ImageCalibration/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/ImageCalibration/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/ObjectTracking/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/ObjectTracking/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/OpenCVCamera/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/OpenCVCamera/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/OpenCVCamera/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/OpenCVCamera/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Perspective/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Perspective/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Perspective/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,13 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
+#add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Perspective/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Perspective/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Perspective/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/RockPaperScissors/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/RockPaperScissors/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/RockPaperScissors/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/RockPaperScissors/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Rotate/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Rotate/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Rotate/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Rotate/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Rotate/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Rotate/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Scale/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Scale/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Scale/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Scale/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Scale/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Scale/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Sepia/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Sepia/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Sepia/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Sepia/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Sepia/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Sepia/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Template/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Template/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Template/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Template/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Template/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Template/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Translate/CMakeLists.txt
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Translate/CMakeLists.txt	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Translate/CMakeLists.txt	2011-06-16 03:06:01 UTC (rev 38)
@@ -103,12 +103,12 @@
 
 
 # target settings for library/executable
+list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${INCLUDE_DIRS})
 
 link_directories(${LIBRARY_DIRS})
 
 add_definitions(${CFLAGS})
-add_definitions(-I${CMAKE_CURRENT_BINARY_DIR})
 
 foreach(idl ${IDL_FILES})
     string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${idl})

Modified: branches/ForVC2010/ImageProcessing/opencv/components/Translate/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/Translate/cmake_modules/FindOpenRTM.cmake	2011-05-31 05:52:27 UTC (rev 37)
+++ branches/ForVC2010/ImageProcessing/opencv/components/Translate/cmake_modules/FindOpenRTM.cmake	2011-06-16 03:06:01 UTC (rev 38)
@@ -141,7 +141,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC110" "coil")
+    foreach(library "RTC110" "coil110")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")



openrtm-commit メーリングリストの案内