Merge pull request #1395 from JdeRobot/release610

Release 6.1.0

.gitignore

@@ -15,7 +15,8 @@ src/interfaces/python/
 *.qrc.depends
 
 .dpkg_pkgs/
-
+build/
+build_clean/
 
 # Python
 __pycache__/

CMakeLists.txt

@@ -1,3 +1,24 @@
+if(NOT WIN32)
+  string(ASCII 27 Esc)
+  set(ColourReset "${Esc}[m")
+  set(ColourBold  "${Esc}[1m")
+  set(Red         "${Esc}[31m")
+  set(Green       "${Esc}[32m")
+  set(Yellow      "${Esc}[33m")
+  set(Blue        "${Esc}[34m")
+  set(Magenta     "${Esc}[35m")
+  set(Cyan        "${Esc}[36m")
+  set(White       "${Esc}[37m")
+  set(BoldRed     "${Esc}[1;31m")
+  set(BoldGreen   "${Esc}[1;32m")
+  set(BoldYellow  "${Esc}[1;33m")
+  set(BoldBlue    "${Esc}[1;34m")
+  set(BoldMagenta "${Esc}[1;35m")
+  set(BoldCyan    "${Esc}[1;36m")
+  set(BoldWhite   "${Esc}[1;37m")
+endif()
+
+
 IF(NOT DEFINED ENABLE_ROS)
   SET(ENABLE_ROS ON)
 ENDIF(NOT DEFINED ENABLE_ROS)
@@ -35,7 +56,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 	include(CheckCXXCompilerFlag)
 	CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 	CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-	message (version: ${CMAKE_CXX_COMPILER_VERSION})
+	message ("-- Compiler version: " ${CMAKE_CXX_COMPILER_VERSION})
 	if(COMPILER_SUPPORTS_CXX11)
     	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 	elseif(COMPILER_SUPPORTS_CXX0X)
@@ -154,7 +175,7 @@ include(FindPkgConfig)
 link_directories(${INTERFACES_CPP_DIR}/jderobot)
 FOREACH(LibFile ${LIBS_NEEDED})
     link_directories(${LIBS_DIR}/${LibFile})
-    MESSAGE("${LIBS_DIR}/${LibFile}")
+    # MESSAGE("${LIBS_DIR}/${LibFile}")
 ENDFOREACH(LibFile)
 
   # FIND AND CHECK OTHER DEPENDENCES
@@ -190,10 +211,10 @@ configure_file(
 
 # Install Executables
 list_subdirectories2( LIST_DRIVERS ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/ 1)
-list_subdirectories2( LIST_TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/ 1)
+# list_subdirectories2( LIST_TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/ 1)
 
 # Install Deps cmake's tree
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Deps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot COMPONENT setup)
+# INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Deps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot COMPONENT setup)
 
 # Install ROS Launch files
 #INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/assets/gazebo/launch DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot COMPONENT setup)
@@ -203,10 +224,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/setup.bash DESTINATION ${CMAKE_INSTALL
 
 
 
-
-
-
-
 #file(WRITE dummy_main1.c "int main(int argc, char** argv){return 0;}")
 #add_executable(dummy_main1 dummy_main1.c)
 #INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/dummy_main1 DESTINATION /tmp COMPONENT deps OPTIONAL PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)

Deps/alut/CMakeLists.txt

@@ -4,13 +4,13 @@ FIND_PATH( alut_INCLUDE_DIR NAMES alut.h  PATHS ENV C++LIB ENV PATH PATH_SUFFIXE
 IF( alut_INCLUDE_DIR )
     FIND_LIBRARY( alut_LIBRARIES NAMES alut PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64 )
     IF( alut_LIBRARIES )
-                MESSAGE ("-- ALUT found at ${alut_LIBRARIES}")
-                include_directories(${alut_INCLUDE_DIR})
-                link_directories(${alut_LIBRARIES})
+        MESSAGE (STATUS "ALUT found at ${alut_LIBRARIES}")
+        include_directories(${alut_INCLUDE_DIR})
+        link_directories(${alut_LIBRARIES})
     ENDIF( alut_LIBRARIES )
 ENDIF(alut_INCLUDE_DIR)
 
 IF(NOT alut_LIBRARIES)
-                MESSAGE ("*** ALUT not found")
+    MESSAGE (STATUS "${BoldYellow}ALUT not found${ColourReset}")
 ENDIF()
 

Deps/ardrone_sdk/CMakeLists.txt

@@ -5,10 +5,10 @@ include(FindPkgConfig)
 PKG_SEARCH_MODULE(ardronelib OPTIONAL ardronelib)
 
 if (ardronelib_FOUND)
-	message(STATUS "ardronelib FOUND. Version: ${ardronelib_VERSION}")
-	message(STATUS "ardronelib libraries: ${ardronelib_LIBRARIES}")
+	message(STATUS "ardronelib v.${ardronelib_VERSION} found")
+	# message(STATUS "ardronelib libraries: ${ardronelib_LIBRARIES}")
 	SET(ARDRONE_ALL_DEPS true)
 	list(APPEND DEPS ardronelib)
 else()
-	message(STATUS "ardronelib NOT FOUND.")
+	message(STATUS "${BoldYellow}ardronelib NOT FOUND${ColourReset}")
 endif()

Deps/cuda/CMakeLists.txt

@@ -2,7 +2,7 @@
 find_package(CUDA QUIET)
 IF (CUDA_LIBRARIES)
 	include_directories(${CUDA_INCLUDE_DIRS})
-	message ("   -- CUDA detected")
+	message ("-- CUDA detected")
 	#find cuda link directories:
 	if (WIN32)
 		add_definitions(-DHAVE_OPENCV_GPU)
@@ -15,6 +15,6 @@ IF (CUDA_LIBRARIES)
 		endif()
 	endif()
 ELSE()
-	message ("   -- CUDA not found!!")
+	MESSAGE ("-- ${BoldYellow}CUDA not found${ColourReset}")
 ENDIF()
 

Deps/fireware/CMakeLists.txt

@@ -6,11 +6,12 @@ FIND_PATH(dc_INCLUDE_DIR  NAMES dc1394.h  PATHS ENV C++LIB ENV PATH PATH_SUFFIXE
 FIND_LIBRARY( with_fireware NAMES dc1394 raw1394 PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64 /usr/lib)
 
 IF(NOT with_fireware)
-    MESSAGE ("*** Fireware libraries: dc1394 or raw1394 not found") 
+    MESSAGE ("-- ${BoldYellow}Fireware libraries: dc1394 or raw1394 not found${ColourReset}") 
+
 ENDIF()
 
 IF(with_fireware)
-    MESSAGE ("*** Fireware ok") 
+    MESSAGE ("-- Fireware found") 
     include_directories(/usr/include)
     link_directories(/usr/lib)
     list(APPEND DEPS libdc1394-22)

Deps/gazebo/CMakeLists.txt

@@ -8,10 +8,10 @@ if (GAZEBO_INCLUDE_DIRS)
         	include_directories(${gazeboInc}/gazebo/)
 	        include_directories(${gazeboInc})
 	ENDFOREACH(gazeboInc)
-	MESSAGE("*** GAZEBO LIBRARIES FOUND: ${GAZEBO_INCLUDE_DIRS} - ${OGRE_INCLUDE_DIRS}")
+	MESSAGE("-- Gazebo libraries found")
 	list(APPEND DEPS gazebo9)
 	list(APPEND DEPS_DEV libgazebo9-dev)
 else()
-	MESSAGE("*** GAZEBO LIBRARIES NOT FOUND")
+	MESSAGE("-- ${BoldYellow}Gazebo libraries NOT found${ColourReset}")
 endif()
 

Deps/glog/CMakeLists.txt

@@ -42,11 +42,11 @@ find_package_handle_standard_args(Glog DEFAULT_MSG GLOG_INCLUDE_DIR GLOG_LIBRARY
 if(GLOG_FOUND)
     set(GLOG_INCLUDE_DIRS ${GLOG_INCLUDE_DIR})
     set(GLOG_LIBRARIES ${GLOG_LIBRARY})
-    message(STATUS "Found glog    (include: ${GLOG_INCLUDE_DIR}, library: ${GLOG_LIBRARY})")
+    message("-- Found glog")
     mark_as_advanced(GLOG_ROOT_DIR GLOG_LIBRARY_RELEASE GLOG_LIBRARY_DEBUG
             GLOG_LIBRARY GLOG_INCLUDE_DIR)
 ELSE()
-    message(FATAL_ERROR "Google Logs is required (libgoogle-glog-dev)")
+    message(FATAL_ERROR "-- ${BoldRed}Google Logs is required (libgoogle-glog-dev)${ColourReset}")
 endif()
 
 

Deps/gtk3/CMakeLists.txt

@@ -4,9 +4,9 @@ PKG_CHECK_MODULES(gtk3 QUIET gtk+-3.0)
 PKG_CHECK_MODULES(gtkmm3 QUIET gtkmm-3.0)
 PKG_CHECK_MODULES(goocanvasmm QUIET goocanvasmm-2.0)
 IF (goocanvasmm_INCLUDE_DIRS)
-    MESSAGE("*** Goocanvasmm LIBRARIES FOUND")
+    MESSAGE("-- Goocanvasmm libraries found")
     list(APPEND DEPS libgoocanvasmm-2.0-6)
     list(APPEND DEPS_DEV libgoocanvasmm-2.0-dev)
 ELSE()
-    MESSAGE("*** Goocanvasmm LIBRARIES NOT FOUND")
+    MESSAGE("---- ${BoldYellow}Goocanvasmm libraries not found${ColourReset}")
 ENDIF()

Deps/ice/CMakeLists.txt

@@ -13,7 +13,7 @@ FIND_PACKAGE(ZeroCIceStorm)
 FIND_PACKAGE(ZeroCIce)
 	IF( ZeroCIceStorm_LIBRARY )
 		#IF( ZeroCIceUtil_LIBRARY )
-			MESSAGE("*** ICE ok")
+			MESSAGE("-- ICE found")
 			include_directories(${ZeroCIceUtil_INCLUDE_DIR})
 			link_directories(${ZeroCIceUtil_LIBRARY})
 			include_directories(${ZeroCIceCore_INCLUDE_DIR})
@@ -31,10 +31,10 @@ FIND_PACKAGE(ZeroCIce)
 	ENDIF( ZeroCIceStorm_LIBRARY )
 
 IF(NOT  ZeroCIceStorm_LIBRARY )
-	MESSAGE(FATAL_ERROR "*** IceStorm not found")
+	MESSAGE(FATAL_ERROR "-- ${BoldRed}IceStorm not found${ColourReset}")
 ENDIF()
 
 IF(NOT  ZeroCIceUtil_LIBRARY )
-	MESSAGE(WARNING "*** IceUtil not found")
+	MESSAGE("-- ${BoldYellow}IceUtil not found${ColourReset}")
 ENDIF()
 

Deps/libfreenect2/CMakeLists.txt

@@ -1,7 +1,7 @@
 SET ( LIBFREENECT_PATH $ENV{LIBFREENECT_ROOT})
 IF (DEFINED LIBFREENECT_PATH)
     SET ( LIBFREENECT_PATH $ENV{LIBFREENECT_ROOT})
-    message("LIBFREENECT FOUND AT ${LIBFREENECT_PATH}")
+    message("-- libfreenect found")
 ELSE()
-    message("LIBFREENECT NOT FOUND")
+    message("-- ${BoldYellow}libfreenect not found${ColourReset}")
 ENDIF()

Deps/libusb/CMakeLists.txt

@@ -1,11 +1,11 @@
 pkg_check_modules(LIBUSB QUIET libusb-1.0)
 
 if (LIBUSB_INCLUDE_DIRS)
-	MESSAGE("*** libusb FOUND")
+	MESSAGE("-- libusb found")
 	list(APPEND DEPS libusb-1.0-0)
 	list(APPEND DEPS_DEV libusb-1.0-0-dev)
 else()
-	MESSAGE("*** libusb NOT FOUND")
+	MESSAGE("-- ${BoldYellow}libusb not found${ColourReset}")
 endif()
 
 

Deps/libxml++/CMakeLists.txt

@@ -5,11 +5,11 @@ include_directories(${libxmlpp_INCLUDE_DIRS})
 link_directories(${libxmlpp_LIBRARY_DIRS})
 
 IF (libxmlpp_INCLUDE_DIRS) 
-	MESSAGE("Libxml++ libraries found at ${libxmlpp_LIBRARY_DIRS}")
+	MESSAGE("-- Libxml++ libraries found")
 	list(APPEND DEPS libxml++2.6-2v5)
 	list(APPEND DEPS_DEV libxml++2.6-dev)
 ELSE()
-	MESSAGE ("*** Libxml++ not found")
+	MESSAGE ("-- ${BoldYellow}Libxml++ not found${ColourReset}")
 ENDIF()
 
 

Deps/libxml2/CMakeLists.txt

@@ -1,23 +1,15 @@
-
-
 FIND_PATH( LIBXML2_INCLUDE_DIR NAMES parser.h PATHS ENV C++LIB ENV PATH PATH_SUFFIXES include/libxml2/libxml/)
 IF( LIBXML2_INCLUDE_DIR )
-
-    MESSAGE("*** LIBXML2 ok")
+    MESSAGE("-- Libxml2 found")
     FIND_LIBRARY( LIBXML2_LIBRARY1 NAMES xml2 PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
-
     SET (LIBXML2_LIBRARIES ${LIBXML2_LIBRARY1} )
     IF( LIBXML2_LIBRARIES )
-		#MESSAGE("LIBXML2 LIBRARY FOUND IN ${LIBXML2_LIBRARIES}")
-
-		list(APPEND DEPS libxml2)
-
+		  list(APPEND DEPS libxml2)
     ENDIF(LIBXML2_LIBRARIES )
-
 ENDIF(LIBXML2_INCLUDE_DIR)
 
 IF (NOT  LIBXML2_INCLUDE_DIR)
-	MESSAGE("*** LIBXML2 not found")
+	MESSAGE("-- ${BoldYellow}libxml2 not found${ColourReset}")
 ELSE()
 	link_directories(${LIBXML2_LIBRARIES})
 	include_directories(${LIBXML2_INCLUDE_DIR})

Deps/mmal/CMakeLists.txt

@@ -1,14 +1,13 @@
 SET(CMAKE_MODULE_PATH
-        ${CMAKE_MODULE_PATH}
-        "${CMAKE_CURRENT_LIST_DIR}/CMake"
+    ${CMAKE_MODULE_PATH}
+    "${CMAKE_CURRENT_LIST_DIR}/CMake"
 )
-
-
 SET(CMAKE_PREFIX_PATH  /opt/vc/include /opt/vc/lib)
 
-FIND_PACKAGE(MMAL)
-
+FIND_PACKAGE(MMAL QUIET)
 
 IF( MMAL_FOUND )
-        MESSAGE("*** MMAL FOUND")
+    MESSAGE("-- mmal found")
+ELSE()
+    MESSAGE("-- ${BoldYellow}mmal not found${ColourReset}")
 ENDIF( MMAL_FOUND )

Deps/nite/CMakeLists.txt

@@ -4,14 +4,14 @@ FIND_PATH( nite_INCLUDE_DIR NAMES XnVCircleDetector.h  PATHS ENV C++LIB ENV PATH
 IF( nite_INCLUDE_DIR )
 	FIND_LIBRARY(nite_LIBRARIES NAMES XnVNite_1_5_2 XnVCNITE_1_5_2 PATHS /usr/lib/ /usr/local/lib)
     IF( nite_LIBRARIES)
-		MESSAGE ("-- Nite found at ${nite_LIBRARIES}")
+		MESSAGE ("-- Nite found")
 		include_directories(${nite_INCLUDE_DIR})
 		link_directories(${nite_LIBRARIES})
     ENDIF( nite_LIBRARIES )
 ENDIF(nite_INCLUDE_DIR)
 
 IF(NOT nite_LIBRARIES)
-		MESSAGE ("*** Nite not found")
+		MESSAGE ("-- ${BoldYellow}Nite not found${ColourReset}")
 ENDIF()
 
 

Deps/nite2/CMakeLists.txt

@@ -7,12 +7,12 @@ if (NITE2_INC AND NITE2_LIB)
 	include_directories(${NITE2_INC})
 	link_directories(${NITE2_LIB}/libNiTE2.so)
 	if (NOT IS_DIRECTORY ./NiTE2)
-		message ("--CMake will install local NiTE2 lib and Driver")
+		message ("-- CMake will install local NiTE2 lib and Driver")
 		file (COPY ${NITE2_LIB}/libNiTE2.so DESTINATION .)
 		file (COPY ${NITE2_LIB}/NiTE2 DESTINATION .)
 	endif()
 else()
-	message("NITE2 library not found")
+	message("-- ${BoldYellow}NITE2 library not found${ColourReset}")
 endif()
 
 

Deps/nodejs/CMakeLists.txt

@@ -5,10 +5,10 @@ FIND_PATH( NODEJS_DIR nodejs node
 SET(NODEJS_COMPILE TRUE)
 
 IF(NOT NODEJS_DIR)
-	MESSAGE("*** NodeJS not found")
+	MESSAGE("-- ${BoldYellow}NodeJS not found${ColourReset}")
 	SET(NODEJS_COMPILE FALSE)
 ELSE()
-	MESSAGE( STATUS " NodeJS found" )
+	MESSAGE( STATUS "NodeJS found" )
 	list(APPEND DEPS nodejs)
 	list(APPEND DEPS_DEV nodejs)
 ENDIF()

Deps/ogre/CMakeLists.txt

@@ -7,10 +7,10 @@ if (OGRE_VERSION)
         	include_directories(${ogreInc}/Paging)
 	        include_directories(${ogreInc})
 	ENDFOREACH(ogreInc)
-	MESSAGE("*** OGRe LIBRARIES FOUND: ${OGRE_INCLUDE_DIRS}")
+	MESSAGE(STATUS "Ogre libraries found")
 	list(APPEND DEPS libogre-1.9.0v5)
 	list(APPEND DEPS_DEV libogre-1.9-dev)
 else()
-	MESSAGE("*** OGRE LIBRARIES NOT FOUND")
+	MESSAGE("-- ${BoldYellow}Ogre libraries not found${ColourReset}")
 endif()
 

Deps/opencv/CMakeLists.txt

@@ -58,8 +58,8 @@ SET(OpenCVGUI_LIBRARIES ${OpenCV_GUI_LIBS})
 #TRY MANUAL IF AUTO FAILS
 IF (NOT DEFINED OpenCV_VERSION)
 	IF (NOT OpenCV_DIR)
-		IF (EXISTS /opt/ros/kinetic/)
-			SET(OpenCV_DIR /opt/ros/kinetic/)
+		IF (EXISTS /opt/ros/melodic/)
+			SET(OpenCV_DIR /opt/ros/melodic/)
 		ELSE()
 			MESSAGE(FATAL_ERROR "OpenCV not found, if you are using a custom opencv installation set if by -DOpenCV_DIR=<your_install_path>")
 		ENDIF()
@@ -122,7 +122,7 @@ IF (NOT DEFINED OpenCV_VERSION)
 
 ENDIF()
 
-message("***OpenCV Version: ${OpenCV_VERSION}")
-message("***OpenCV CORE LIBS: ${OpenCV_LIBRARIES}")
-message("***OpenCV GUI LIBS: ${OpenCVGUI_LIBRARIES}")
-message("***OpenCV EXTRA LIBS: ${OpenCV_EXTRA_LIBS}")
+message("-- OpenCV Version: ${OpenCV_VERSION}")
+message("--	  OpenCV CORE LIBS: ${OpenCV_LIBRARIES}")
+message("--	  OpenCV GUI LIBS: ${OpenCVGUI_LIBRARIES}")
+message("--	  OpenCV EXTRA LIBS: ${OpenCV_EXTRA_LIBS}")

Deps/opengl/CMakeLists.txt

@@ -4,15 +4,15 @@ find_package(OpenGL REQUIRED)
 
 IF (NOT GLUT_LIBRARIES MATCHES ".*NOTFOUND.*" AND
     NOT OPENGL_LIBRARIES MATCHES ".*NOTFOUND.*") 
-        MESSAGE("OpenGL libraries found at ${GLUT_LIBRARIES}")
+        MESSAGE(STATUS "OpenGL libraries found")
 
         include_directories(${GLUT_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIRS})
         link_directories(${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} )
 
         list(APPEND DEPS freeglut3 libglu1-mesa)
         list(APPEND DEPS_DEV freeglut3-dev libglu1-mesa-dev)
 ELSE()
-        MESSAGE ("*** OpenGL not found")
+        MESSAGE (STATUS "${BoldYellow}OpenGL not found${ColourReset}")
 ENDIF()