[Jderobot-admin] jderobot-r1021 - in trunk: . Deps Deps/qt src/stable/components src/stable/components/introrob_qt src/stable/components/opencvdemo src/testing/components

ahcorde en jderobot.org ahcorde en jderobot.org
Mie Oct 9 12:13:56 CEST 2013


Author: ahcorde
Date: 2013-10-09 12:12:56 +0200 (Wed, 09 Oct 2013)
New Revision: 1021

Added:
   trunk/Deps/qt/
   trunk/Deps/qt/CMakeLists.txt
   trunk/src/stable/components/introrob_qt/
Removed:
   trunk/src/testing/components/introrob_qt/
Modified:
   trunk/CMakeLists.txt
   trunk/src/stable/components/introrob_qt/CMakeLists.txt
   trunk/src/stable/components/opencvdemo/CMakeLists.txt
Log:
#57 Anado alas Dep qt y paso a stable introrob_qt


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-10-08 15:40:52 UTC (rev 1020)
+++ trunk/CMakeLists.txt	2013-10-09 10:12:56 UTC (rev 1021)
@@ -88,6 +88,7 @@
 include(${DEPS_DIR}/alut/CMakeLists.txt)
 include(${DEPS_DIR}/tinyxml/CMakeLists.txt)
 include(${DEPS_DIR}/gtk2/CMakeLists.txt)
+include(${DEPS_DIR}/qt/CMakeLists.txt)
 
 #include(${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/CMakeLists.txt)
 

Added: trunk/Deps/qt/CMakeLists.txt
===================================================================
--- trunk/Deps/qt/CMakeLists.txt	                        (rev 0)
+++ trunk/Deps/qt/CMakeLists.txt	2013-10-09 10:12:56 UTC (rev 1021)
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 2.8)
+include(FindPkgConfig)
+
+FIND_PACKAGE(Qt4) 
+
+SET(QT_USE_QTOPENGL TRUE)
+INCLUDE(${QT_USE_FILE})
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+
+SET(QT_LIBRARIES_JDE ${QT_LIBRARIES})
+
+MESSAGE( "${QT_LIBRARIES} ${GLUT_LIBRARIES}"  )
+
+if (QT_LIBRARIES_JDE)
+    SET(QT_COMPILE TRUE)
+		MESSAGE("*** QT LIBRARIES Found LIBRARIES FOUND")
+else()
+    SET(QT_COMPILE FALSE)
+		MESSAGE("*** QT LIBRARIES NOT FOUND")
+endif()
+

Modified: trunk/src/stable/components/introrob_qt/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/introrob_qt/CMakeLists.txt	2013-10-08 15:40:52 UTC (rev 1020)
+++ trunk/src/stable/components/introrob_qt/CMakeLists.txt	2013-10-09 10:12:56 UTC (rev 1021)
@@ -1,64 +1,50 @@
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-include (FindPkgConfig)
-if (PKG_CONFIG_FOUND)
-	pkg_check_modules(OpenCV opencv)
-endif()
 
-FIND_PACKAGE(Qt4 REQUIRED)
+if (${QT_COMPILE})
 
-SET(qt_SOURCES main.cpp depuratewindow.cpp MyAlgorithm.cpp
-				robot/actuators.cpp robot/robot.cpp robot/sensors.cpp robot/threadupdaterobot.cpp 
-			 gui/gui.cpp gui/threadupdategui.cpp
-			 gui/widget/cameraswidget.cpp gui/widget/controlvw.cpp gui/widget/glwidget.cpp gui/widget/laserwidget.cpp
-)
+    SET(qt_SOURCES main.cpp depuratewindow.cpp MyAlgorithm.cpp
+				   robot/actuators.cpp robot/robot.cpp robot/sensors.cpp robot/threadupdaterobot.cpp 
+			       gui/gui.cpp gui/threadupdategui.cpp
+			       gui/widget/cameraswidget.cpp gui/widget/controlvw.cpp gui/widget/glwidget.cpp gui/widget/laserwidget.cpp
+    )
 
-SET(qt_HEADERS
-			depuratewindow.h
-			robot/actuators.h robot/robot.h robot/sensors.h robot/threadupdaterobot.h 
-     		pioneer/pioneer.c pioneer/pioneeropengl.c
-			gui/gui.h gui/stategui.h gui/threadupdategui.h
-			gui/widget/cameraswidget.h gui/widget/controlvw.h gui/widget/glwidget.h gui/widget/laserwidget.h
+    SET(qt_HEADERS
+			    depuratewindow.h
+			    robot/actuators.h robot/robot.h robot/sensors.h robot/threadupdaterobot.h 
+         		pioneer/pioneer.c pioneer/pioneeropengl.c
+			    gui/gui.h gui/stategui.h gui/threadupdategui.h
+			    gui/widget/cameraswidget.h gui/widget/controlvw.h gui/widget/glwidget.h gui/widget/laserwidget.h
 
-)
+    )
 
-SET(qt_RESOURCES resources.qrc)
-QT4_ADD_RESOURCES(qt_RESOURCES_RCC ${qt_RESOURCES})
+    SET(qt_RESOURCES resources.qrc)
+    QT4_ADD_RESOURCES(qt_RESOURCES_RCC ${qt_RESOURCES})
 
-SET(QT_USE_QTOPENGL TRUE)
+    QT4_WRAP_CPP(qt_HEADERS_MOC ${qt_HEADERS})
 
-SET( LIBS_DIR /usr/local/lib/jderobot/)
+    ADD_DEFINITIONS(${QT_DEFINITIONS})
 
-set( CMAKE_CXX_FLAGS " -lIce -lIceUtil -lGL -lGLU -lglut " )
+    include_directories(
+        ${INTERFACES_CPP_DIR}
+        ${LIBS_DIR}/
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    )
 
+    add_executable( introrob_qt main.cpp depuratewindow.cpp MyAlgorithm.cpp
+				    robot/actuators.cpp robot/robot.cpp robot/sensors.cpp robot/threadupdaterobot.cpp 
+			        pioneer/pioneer.c pioneer/pioneeropengl.c
+			        gui/gui.cpp gui/stategui.cpp gui/threadupdategui.cpp
+			        gui/widget/cameraswidget.cpp gui/widget/controlvw.cpp gui/widget/glwidget.cpp gui/widget/laserwidget.cpp
+			        ${qt_HEADERS_MOC}
+			        ${qt_RESOURCES_RCC}
+    )
+			       
+    target_link_libraries(introrob_qt
+        ${OpenCV_LIBRARIES}
+	    ${QT_LIBRARIES_JDE}
+        JderobotInterfaces
+        jderobotutil
+        ${ZeroCIce_LIBRARIES}
+${OPENGL_LIBRARIES} ${GLUT_LIBRARY}
+    )
+ENDIF()
 
-QT4_WRAP_CPP(qt_HEADERS_MOC ${qt_HEADERS})
-INCLUDE(${QT_USE_FILE})
-ADD_DEFINITIONS(${QT_DEFINITIONS})
-
-
-
-include_directories(${opencv_INCLUDE_DIRS})
-link_directories( ${opencv_library_dirs})
-
-
-include_directories(
-    /usr/local/include/jderobot/
-)
-
-add_executable( main main.cpp depuratewindow.cpp MyAlgorithm.cpp
-				robot/actuators.cpp robot/robot.cpp robot/sensors.cpp robot/threadupdaterobot.cpp 
-			 pioneer/pioneer.c pioneer/pioneeropengl.c
-			 gui/gui.cpp gui/stategui.cpp gui/threadupdategui.cpp
-			 gui/widget/cameraswidget.cpp gui/widget/controlvw.cpp gui/widget/glwidget.cpp gui/widget/laserwidget.cpp
-			   ${qt_HEADERS_MOC}
-			   ${qt_RESOURCES_RCC}
-)
-			   
-target_link_libraries(main opencv_imgproc opencv_highgui opencv_core
-	${QT_LIBRARIES}
-	${LIBS_DIR}/libJderobotInterfaces.so
-	${LIBS_DIR}/libjderobotice.so
-	${LIBS_DIR}/libjderobotutil.so
-
-)
-

Modified: trunk/src/stable/components/opencvdemo/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/opencvdemo/CMakeLists.txt	2013-10-08 15:40:52 UTC (rev 1020)
+++ trunk/src/stable/components/opencvdemo/CMakeLists.txt	2013-10-09 10:12:56 UTC (rev 1021)
@@ -22,7 +22,7 @@
     colorspacesmm
     JderobotInterfaces
     jderobotutil
-    ${Gearbox_LIBRARIES}
+#    ${Gearbox_LIBRARIES}
     ${ZeroCIce_LIBRARIES}
 
 



More information about the Jderobot-admin mailing list