[Jderobot-admin] jderobot-r1015 - in trunk: . Deps Deps/gtk2 src/stable/components/basic_component src/stable/components/cameraview src/stable/components/introrob src/stable/components/kinectViewer src/stable/components/opencvdemo src/stable/components/recorder src/stable/components/remoteConfiguration src/stable/components/replayController src/stable/components/replayer src/stable/components/rgbdCalibrator src/stable/components/rgbdManualCalibrator

rocapal en jderobot.org rocapal en jderobot.org
Lun Oct 7 16:26:04 CEST 2013


Author: rocapal
Date: 2013-10-07 16:25:04 +0200 (Mon, 07 Oct 2013)
New Revision: 1015

Added:
   trunk/Deps/gtk2/
   trunk/Deps/gtk2/CMakeLists.txt
Modified:
   trunk/CMakeLists.txt
   trunk/src/stable/components/basic_component/CMakeLists.txt
   trunk/src/stable/components/cameraview/CMakeLists.txt
   trunk/src/stable/components/introrob/CMakeLists.txt
   trunk/src/stable/components/kinectViewer/CMakeLists.txt
   trunk/src/stable/components/opencvdemo/CMakeLists.txt
   trunk/src/stable/components/recorder/CMakeLists.txt
   trunk/src/stable/components/remoteConfiguration/CMakeLists.txt
   trunk/src/stable/components/replayController/CMakeLists.txt
   trunk/src/stable/components/replayer/CMakeLists.txt
   trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt
   trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt
Log:
#65 added gtk2 includes into components


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -43,49 +43,18 @@
 
 include(FindPkgConfig)
 
-PKG_CHECK_MODULES(gtk20 REQUIRED gtk+-2.0)
-include_directories(${gtk20_INCLUDE_DIRS})
-link_directories(${gtk20_LIBRARY_DIRS})
-
-PKG_CHECK_MODULES(gtkgl20 REQUIRED gtkgl-2.0)
-include_directories(${gtkgl20_INCLUDE_DIRS})
-link_directories(${gtkgl20_LIBRARY_DIRS})
-
-PKG_CHECK_MODULES(gtkmm REQUIRED gtkmm-2.4)
-include_directories(${gtkmm_INCLUDE_DIRS})
-link_directories(${gtkmm_LIBRARY_DIRS})
-
-PKG_CHECK_MODULES(libglademm REQUIRED libglademm-2.4)
-include_directories(${libglademm_INCLUDE_DIRS})
-link_directories(${libglademm_LIBRARY_DIRS})
-
-PKG_CHECK_MODULES(gthread REQUIRED gthread-2.0)
-include_directories(${gthread_INCLUDE_DIRS})
-link_directories(${gthread_LIBRARY_DIRS})
-
-PKG_CHECK_MODULES(libgnomecanvas REQUIRED libgnomecanvas-2.0)
-include_directories(${libgnomecanvas_INCLUDE_DIRS})
-link_directories(${libgnomecanvas_LIBRARY_DIRS})
-
-PKG_CHECK_MODULES(libgnomecanvasmm REQUIRED libgnomecanvasmm-2.6)
-include_directories(${libgnomecanvasmm_INCLUDE_DIRS})
-link_directories(${libgnomecanvasmm_LIBRARY_DIRS})
-
-PKG_CHECK_MODULES(gtkglextmm REQUIRED gtkglextmm-1.2)
-include_directories(${gtkglextmm_INCLUDE_DIRS})
-link_directories(${gtkglextmm_LIBRARY_DIRS})
-
-PKG_CHECK_MODULES(gsl REQUIRED gsl)
-include_directories(${gsl_INCLUDE_DIRS})
-link_directories(${gsl_LIBRARIES_DIRS})
-
 PKG_CHECK_MODULES(gstreamer REQUIRED gstreamer-0.10) 
 include_directories(${gstreamer_INCLUDE_DIRS})
 link_directories(${gstreamer_LIBRARY_DIRS})
+
 PKG_CHECK_MODULES(gstreamerapp REQUIRED gstreamer-app-0.10)
 include_directories(${gstreamerapp_INCLUDE_DIRS})
 link_directories(${gstreamerapp_LIBRARY_DIRS})
 
+PKG_CHECK_MODULES(gsl REQUIRED gsl)
+include_directories(${gsl_INCLUDE_DIRS})
+link_directories(${gsl_LIBRARIES_DIRS})
+
 PKG_CHECK_MODULES(eigen REQUIRED eigen3)
 include_directories(${eigen_INCLUDE_DIRS})
 
@@ -118,6 +87,7 @@
 include(${DEPS_DIR}/boost/CMakeLists.txt)
 include(${DEPS_DIR}/alut/CMakeLists.txt)
 include(${DEPS_DIR}/tinyxml/CMakeLists.txt)
+include(${DEPS_DIR}/gtk2/CMakeLists.txt)
 
 #include(${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/CMakeLists.txt)
 

Added: trunk/Deps/gtk2/CMakeLists.txt
===================================================================
--- trunk/Deps/gtk2/CMakeLists.txt	                        (rev 0)
+++ trunk/Deps/gtk2/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -0,0 +1,10 @@
+include(FindPkgConfig)
+
+PKG_CHECK_MODULES(gtk20 REQUIRED gtk+-2.0)
+PKG_CHECK_MODULES(gtkgl20 REQUIRED gtkgl-2.0)
+PKG_CHECK_MODULES(gtkmm REQUIRED gtkmm-2.4)
+PKG_CHECK_MODULES(libglademm REQUIRED libglademm-2.4)
+PKG_CHECK_MODULES(gthread REQUIRED gthread-2.0)
+PKG_CHECK_MODULES(libgnomecanvas REQUIRED libgnomecanvas-2.0)
+PKG_CHECK_MODULES(libgnomecanvasmm REQUIRED libgnomecanvasmm-2.6)
+PKG_CHECK_MODULES(gtkglextmm REQUIRED gtkglextmm-1.2)

Modified: trunk/src/stable/components/basic_component/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/basic_component/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/basic_component/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -6,6 +6,8 @@
     ${INTERFACES_CPP_DIR}
     ${LIBS_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
 )
 
 add_executable (basic_component  ${SOURCE_FILES})

Modified: trunk/src/stable/components/cameraview/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/cameraview/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/cameraview/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -6,6 +6,9 @@
     ${INTERFACES_CPP_DIR}
     ${LIBS_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
+    ${gtkglextmm_INCLUDE_DIRS}
 )
 
 add_executable (cameraview ${SOURCE_FILES})

Modified: trunk/src/stable/components/introrob/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/introrob/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/introrob/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -8,6 +8,11 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/cameras
     ${CMAKE_CURRENT_SOURCE_DIR}/../calibrator
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
+    ${gtkglextmm_INCLUDE_DIRS}
+    ${libgnomecanvas_INCLUDE_DIRS}
+    ${libgnomecanvasmm_INCLUDE_DIRS}
 )
 
 set( CMAKE_CXX_FLAGS "") #"-lgsl -lgslcblas" ) # Opciones para el compilador

Modified: trunk/src/stable/components/kinectViewer/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/kinectViewer/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/kinectViewer/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -9,6 +9,9 @@
     ${LIBS_DIR}/
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/cameras
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
+    ${gtkglextmm_INCLUDE_DIRS}
 )
 
 add_executable (kinectViewer ${SOURCE_FILES})

Modified: trunk/src/stable/components/opencvdemo/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/opencvdemo/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/opencvdemo/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -5,6 +5,8 @@
     ${INTERFACES_CPP_DIR}
     ${LIBS_DIR}/
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
 )
 
 
@@ -13,19 +15,15 @@
 
 TARGET_LINK_LIBRARIES(opencvdemo
     ${CMAKE_THREAD_LIBS_INIT} 
-    ${opencv_LIBRARIES}
+    ${OpenCV_LIBRARIES}
     ${OpenCVGUI_LIBRARIES}
     ${gtkmm_LIBRARIES}
     ${libglademm_LIBRARIES}
-#    ${gthread_LIBRARIES}
-#    ${libgnomecanvas_LIBRARIES}
-#    ${libgnomecanvasmm_LIBRARIES}
-#    ${gtkglextmm_LIBRARIES}
-    ${OpenCV_LIBRARIES}
     colorspacesmm
     JderobotInterfaces
     jderobotutil
     ${Gearbox_LIBRARIES}
     ${ZeroCIce_LIBRARIES}
 
+
 )

Modified: trunk/src/stable/components/recorder/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/recorder/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/recorder/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -9,6 +9,9 @@
     ${LIBS_DIR}/
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/cameras
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
+    ${gtkglextmm_INCLUDE_DIRS}
 )
 
 add_executable (recorder ${SOURCE_FILES})
@@ -22,10 +25,10 @@
     ${gtkmm_LIBRARIES}
     ${libglademm_LIBRARIES}
     ${gtkglextmm_LIBRARIES}
+    ${gsl_LIBRARIES}
+    ${ZeroCIce_LIBRARIES}
+    ${Boost_LIBRARIES}
     colorspacesmm
     JderobotInterfaces
     jderobotutil
-    ${gsl_LIBRARIES}
-    ${ZeroCIce_LIBRARIES}
-    ${Boost_LIBRARIES}
 )

Modified: trunk/src/stable/components/remoteConfiguration/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/remoteConfiguration/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/remoteConfiguration/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -13,6 +13,9 @@
 		${LIBS_DIR}/
 		${CMAKE_CURRENT_SOURCE_DIR}
 		${CMAKE_CURRENT_SOURCE_DIR}/cameras
+		${gtkmm_INCLUDE_DIRS}
+        ${libglademm_INCLUDE_DIRS}
+        ${gtkglextmm_INCLUDE_DIRS}
 	)
 
 	add_executable (remoteConfiguration ${SOURCE_FILES})

Modified: trunk/src/stable/components/replayController/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/replayController/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/replayController/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -12,6 +12,9 @@
     ${INTERFACES_CPP_DIR}
     ${LIBS_DIR}/
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
+    ${gtkglextmm_INCLUDE_DIRS}
 )
 
 add_executable (replayController ${SOURCE_FILES})

Modified: trunk/src/stable/components/replayer/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/replayer/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/replayer/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -9,6 +9,9 @@
     ${LIBS_DIR}/
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/cameras
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
+    ${gtkglextmm_INCLUDE_DIRS}
 )
 
 add_executable (replayer ${SOURCE_FILES})

Modified: trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -6,6 +6,8 @@
     ${INTERFACES_CPP_DIR}
     ${LIBS_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
 )
 
 add_executable (rgbdCalibrator ${SOURCE_FILES})
@@ -18,10 +20,10 @@
     ${OpenCVGUI_LIBRARIES}
     ${gtkmm_LIBRARIES}
     ${libglademm_LIBRARIES}
+    ${ZeroCIce_LIBRARIES}
+    ${Boost_LIBRARIES}
     colorspacesmm
     JderobotInterfaces
-    ${ZeroCIce_LIBRARIES}
-    ${Boost_LIBRARIES}
     progeo
     geometry
     colorspaces

Modified: trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt	2013-10-07 14:14:20 UTC (rev 1014)
+++ trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt	2013-10-07 14:25:04 UTC (rev 1015)
@@ -7,7 +7,11 @@
     ${gl_INCLUDE_DIRS}
     ${glu_INCLUDE_DIRS}
     ${glut_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_SOURCE_DIR})
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
+    ${gtkglextmm_INCLUDE_DIRS}
+    )
 
 add_executable (rgbdManualCalibrator ${SOURCE_FILES})
 



More information about the Jderobot-admin mailing list