Merge pull request #1395 from JdeRobot/release610

Release 6.1.0

Author: fqez

.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()