[Jderobot-admin] jderobot-r1022 - in trunk: Deps/qt src/stable/components src/stable/components/basic_component_qt src/stable/components/introrob_qt src/testing/components

[ahcorde en jderobot.org]

Author: ahcorde
Date: 2013-10-09 12:22:24 +0200 (Wed, 09 Oct 2013)
New Revision: 1022

Added:
   trunk/src/stable/components/basic_component_qt/
Removed:
   trunk/src/testing/components/basic_component_qt/
Modified:
   trunk/Deps/qt/CMakeLists.txt
   trunk/src/stable/components/basic_component_qt/CMakeLists.txt
   trunk/src/stable/components/introrob_qt/CMakeLists.txt
Log:
#57 Pasado a Stable basic_component_qt


Modified: trunk/Deps/qt/CMakeLists.txt
===================================================================
--- trunk/Deps/qt/CMakeLists.txt	2013-10-09 10:12:56 UTC (rev 1021)
+++ trunk/Deps/qt/CMakeLists.txt	2013-10-09 10:22:24 UTC (rev 1022)
@@ -9,8 +9,6 @@
 
 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")

Modified: trunk/src/stable/components/basic_component_qt/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/basic_component_qt/CMakeLists.txt	2013-10-08 15:40:52 UTC (rev 1020)
+++ trunk/src/stable/components/basic_component_qt/CMakeLists.txt	2013-10-09 10:22:24 UTC (rev 1022)
@@ -1,52 +1,40 @@
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-include (FindPkgConfig)
-if (PKG_CONFIG_FOUND)
-	pkg_check_modules(OpenCV opencv)
-endif()
+if (${QT_COMPILE})
 
-FIND_PACKAGE(Qt4 REQUIRED)
 
-SET(qt_SOURCES main.cpp 
-			   sensors/threadsensors.cpp sensors/sensors.cpp
-			   gui/threadgui.cpp gui/gui.cpp
-)
+    SET(qt_SOURCES main.cpp 
+			       sensors/threadsensors.cpp sensors/sensors.cpp
+			       gui/threadgui.cpp gui/gui.cpp
+    )
 
-SET(qt_HEADERS
-			   sensors/threadsensors.h sensors/sensors.h
-			   gui/threadgui.h gui/gui.h
+    SET(qt_HEADERS
+			       sensors/threadsensors.h sensors/sensors.h
+			       gui/threadgui.h gui/gui.h
 
-)
+    )
 
-SET( LIBS_DIR /usr/local/lib/jderobot/)
+    include_directories(
+        ${INTERFACES_CPP_DIR}
+        ${LIBS_DIR}/
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    )
 
-set( CMAKE_CXX_FLAGS " -lIce -lIceUtil " )
+    QT4_WRAP_CPP(qt_HEADERS_MOC ${qt_HEADERS})
 
 
-QT4_WRAP_CPP(qt_HEADERS_MOC ${qt_HEADERS})
-INCLUDE(${QT_USE_FILE})
-ADD_DEFINITIONS(${QT_DEFINITIONS})
+    add_executable( basic_component_qt
+                    main.cpp 
+			        sensors/threadsensors.cpp sensors/sensors.cpp
+			        gui/threadgui.cpp gui/gui.cpp
+			        ${qt_HEADERS_MOC}
+    )
+			       
+    target_link_libraries(basic_component_qt 
+        ${CMAKE_THREAD_LIBS_INIT}
+        ${OpenCV_LIBRARIES}
+	    ${QT_LIBRARIES_JDE}
+        JderobotInterfaces
+        jderobotutil
+        ${ZeroCIce_LIBRARIES}
+    )
+ENDIF()
 
-
-
-include_directories(${opencv_INCLUDE_DIRS})
-link_directories( ${opencv_library_dirs})
-
-
-include_directories(
-    /usr/local/include/jderobot/
-)
-
-add_executable( main main.cpp 
-			   sensors/threadsensors.cpp sensors/sensors.cpp
-			   gui/threadgui.cpp gui/gui.cpp
-			   ${qt_HEADERS_MOC}
-)
-			   
-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/introrob_qt/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/introrob_qt/CMakeLists.txt	2013-10-09 10:12:56 UTC (rev 1021)
+++ trunk/src/stable/components/introrob_qt/CMakeLists.txt	2013-10-09 10:22:24 UTC (rev 1022)
@@ -39,6 +39,7 @@
     )
 			       
     target_link_libraries(introrob_qt
+        ${CMAKE_THREAD_LIBS_INIT}
         ${OpenCV_LIBRARIES}
 	    ${QT_LIBRARIES_JDE}
         JderobotInterfaces