Skip to content
This repository was archived by the owner on Feb 21, 2021. It is now read-only.

Commit 5afdf19

Browse files
fqezfqez
authored
Merge pull request #1395 from JdeRobot/release610
Release 6.1.0
2 parents 762316e + b1e9b2a commit 5afdf19

File tree

1,087 files changed

+235
-521091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,087 files changed

+235
-521091
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ src/interfaces/python/
1515
*.qrc.depends
1616

1717
.dpkg_pkgs/
18-
18+
build/
19+
build_clean/
1920

2021
# Python
2122
__pycache__/

‎CMakeLists.txt

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
if(NOT WIN32)
2+
string(ASCII 27 Esc)
3+
set(ColourReset "${Esc}[m")
4+
set(ColourBold "${Esc}[1m")
5+
set(Red "${Esc}[31m")
6+
set(Green "${Esc}[32m")
7+
set(Yellow "${Esc}[33m")
8+
set(Blue "${Esc}[34m")
9+
set(Magenta "${Esc}[35m")
10+
set(Cyan "${Esc}[36m")
11+
set(White "${Esc}[37m")
12+
set(BoldRed "${Esc}[1;31m")
13+
set(BoldGreen "${Esc}[1;32m")
14+
set(BoldYellow "${Esc}[1;33m")
15+
set(BoldBlue "${Esc}[1;34m")
16+
set(BoldMagenta "${Esc}[1;35m")
17+
set(BoldCyan "${Esc}[1;36m")
18+
set(BoldWhite "${Esc}[1;37m")
19+
endif()
20+
21+
122
IF(NOT DEFINED ENABLE_ROS)
223
SET(ENABLE_ROS ON)
324
ENDIF(NOT DEFINED ENABLE_ROS)
@@ -35,7 +56,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
3556
include(CheckCXXCompilerFlag)
3657
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
3758
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
38-
message (version: ${CMAKE_CXX_COMPILER_VERSION})
59+
message ("-- Compiler version: " ${CMAKE_CXX_COMPILER_VERSION})
3960
if(COMPILER_SUPPORTS_CXX11)
4061
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
4162
elseif(COMPILER_SUPPORTS_CXX0X)
@@ -154,7 +175,7 @@ include(FindPkgConfig)
154175
link_directories(${INTERFACES_CPP_DIR}/jderobot)
155176
FOREACH(LibFile ${LIBS_NEEDED})
156177
link_directories(${LIBS_DIR}/${LibFile})
157-
MESSAGE("${LIBS_DIR}/${LibFile}")
178+
# MESSAGE("${LIBS_DIR}/${LibFile}")
158179
ENDFOREACH(LibFile)
159180

160181
# FIND AND CHECK OTHER DEPENDENCES
@@ -190,10 +211,10 @@ configure_file(
190211

191212
# Install Executables
192213
list_subdirectories2( LIST_DRIVERS ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/ 1)
193-
list_subdirectories2( LIST_TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/ 1)
214+
# list_subdirectories2( LIST_TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/ 1)
194215

195216
# Install Deps cmake's tree
196-
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Deps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot COMPONENT setup)
217+
# INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Deps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot COMPONENT setup)
197218

198219
# Install ROS Launch files
199220
#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
203224

204225

205226

206-
207-
208-
209-
210227
#file(WRITE dummy_main1.c "int main(int argc, char** argv){return 0;}")
211228
#add_executable(dummy_main1 dummy_main1.c)
212229
#INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/dummy_main1 DESTINATION /tmp COMPONENT deps OPTIONAL PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)

‎Deps/alut/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ FIND_PATH( alut_INCLUDE_DIR NAMES alut.h PATHS ENV C++LIB ENV PATH PATH_SUFFIXE
44
IF( alut_INCLUDE_DIR )
55
FIND_LIBRARY( alut_LIBRARIES NAMES alut PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64 )
66
IF( alut_LIBRARIES )
7-
MESSAGE ("-- ALUT found at ${alut_LIBRARIES}")
8-
include_directories(${alut_INCLUDE_DIR})
9-
link_directories(${alut_LIBRARIES})
7+
MESSAGE (STATUS "ALUT found at ${alut_LIBRARIES}")
8+
include_directories(${alut_INCLUDE_DIR})
9+
link_directories(${alut_LIBRARIES})
1010
ENDIF( alut_LIBRARIES )
1111
ENDIF(alut_INCLUDE_DIR)
1212

1313
IF(NOT alut_LIBRARIES)
14-
MESSAGE ("*** ALUT not found")
14+
MESSAGE (STATUS "${BoldYellow}ALUT not found${ColourReset}")
1515
ENDIF()
1616

‎Deps/ardrone_sdk/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ include(FindPkgConfig)
55
PKG_SEARCH_MODULE(ardronelib OPTIONAL ardronelib)
66

77
if (ardronelib_FOUND)
8-
message(STATUS "ardronelib FOUND. Version: ${ardronelib_VERSION}")
9-
message(STATUS "ardronelib libraries: ${ardronelib_LIBRARIES}")
8+
message(STATUS "ardronelib v.${ardronelib_VERSION} found")
9+
# message(STATUS "ardronelib libraries: ${ardronelib_LIBRARIES}")
1010
SET(ARDRONE_ALL_DEPS true)
1111
list(APPEND DEPS ardronelib)
1212
else()
13-
message(STATUS "ardronelib NOT FOUND.")
13+
message(STATUS "${BoldYellow}ardronelib NOT FOUND${ColourReset}")
1414
endif()

‎Deps/cuda/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
find_package(CUDA QUIET)
33
IF (CUDA_LIBRARIES)
44
include_directories(${CUDA_INCLUDE_DIRS})
5-
message (" -- CUDA detected")
5+
message ("-- CUDA detected")
66
#find cuda link directories:
77
if (WIN32)
88
add_definitions(-DHAVE_OPENCV_GPU)
@@ -15,6 +15,6 @@ IF (CUDA_LIBRARIES)
1515
endif()
1616
endif()
1717
ELSE()
18-
message (" -- CUDA not found!!")
18+
MESSAGE ("-- ${BoldYellow}CUDA not found${ColourReset}")
1919
ENDIF()
2020

‎Deps/fireware/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ FIND_PATH(dc_INCLUDE_DIR NAMES dc1394.h PATHS ENV C++LIB ENV PATH PATH_SUFFIXE
66
FIND_LIBRARY( with_fireware NAMES dc1394 raw1394 PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64 /usr/lib)
77

88
IF(NOT with_fireware)
9-
MESSAGE ("*** Fireware libraries: dc1394 or raw1394 not found")
9+
MESSAGE ("-- ${BoldYellow}Fireware libraries: dc1394 or raw1394 not found${ColourReset}")
10+
1011
ENDIF()
1112

1213
IF(with_fireware)
13-
MESSAGE ("*** Fireware ok")
14+
MESSAGE ("-- Fireware found")
1415
include_directories(/usr/include)
1516
link_directories(/usr/lib)
1617
list(APPEND DEPS libdc1394-22)

‎Deps/gazebo/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ if (GAZEBO_INCLUDE_DIRS)
88
include_directories(${gazeboInc}/gazebo/)
99
include_directories(${gazeboInc})
1010
ENDFOREACH(gazeboInc)
11-
MESSAGE("*** GAZEBO LIBRARIES FOUND: ${GAZEBO_INCLUDE_DIRS} - ${OGRE_INCLUDE_DIRS}")
11+
MESSAGE("-- Gazebo libraries found")
1212
list(APPEND DEPS gazebo9)
1313
list(APPEND DEPS_DEV libgazebo9-dev)
1414
else()
15-
MESSAGE("*** GAZEBO LIBRARIES NOT FOUND")
15+
MESSAGE("-- ${BoldYellow}Gazebo libraries NOT found${ColourReset}")
1616
endif()
1717

‎Deps/glog/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ find_package_handle_standard_args(Glog DEFAULT_MSG GLOG_INCLUDE_DIR GLOG_LIBRARY
4242
if(GLOG_FOUND)
4343
set(GLOG_INCLUDE_DIRS ${GLOG_INCLUDE_DIR})
4444
set(GLOG_LIBRARIES ${GLOG_LIBRARY})
45-
message(STATUS "Found glog (include: ${GLOG_INCLUDE_DIR}, library: ${GLOG_LIBRARY})")
45+
message("-- Found glog")
4646
mark_as_advanced(GLOG_ROOT_DIR GLOG_LIBRARY_RELEASE GLOG_LIBRARY_DEBUG
4747
GLOG_LIBRARY GLOG_INCLUDE_DIR)
4848
ELSE()
49-
message(FATAL_ERROR "Google Logs is required (libgoogle-glog-dev)")
49+
message(FATAL_ERROR "-- ${BoldRed}Google Logs is required (libgoogle-glog-dev)${ColourReset}")
5050
endif()
5151

5252

‎Deps/gtk3/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ PKG_CHECK_MODULES(gtk3 QUIET gtk+-3.0)
44
PKG_CHECK_MODULES(gtkmm3 QUIET gtkmm-3.0)
55
PKG_CHECK_MODULES(goocanvasmm QUIET goocanvasmm-2.0)
66
IF (goocanvasmm_INCLUDE_DIRS)
7-
MESSAGE("*** Goocanvasmm LIBRARIES FOUND")
7+
MESSAGE("-- Goocanvasmm libraries found")
88
list(APPEND DEPS libgoocanvasmm-2.0-6)
99
list(APPEND DEPS_DEV libgoocanvasmm-2.0-dev)
1010
ELSE()
11-
MESSAGE("*** Goocanvasmm LIBRARIES NOT FOUND")
11+
MESSAGE("---- ${BoldYellow}Goocanvasmm libraries not found${ColourReset}")
1212
ENDIF()

‎Deps/ice/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FIND_PACKAGE(ZeroCIceStorm)
1313
FIND_PACKAGE(ZeroCIce)
1414
IF( ZeroCIceStorm_LIBRARY )
1515
#IF( ZeroCIceUtil_LIBRARY )
16-
MESSAGE("*** ICE ok")
16+
MESSAGE("-- ICE found")
1717
include_directories(${ZeroCIceUtil_INCLUDE_DIR})
1818
link_directories(${ZeroCIceUtil_LIBRARY})
1919
include_directories(${ZeroCIceCore_INCLUDE_DIR})
@@ -31,10 +31,10 @@ FIND_PACKAGE(ZeroCIce)
3131
ENDIF( ZeroCIceStorm_LIBRARY )
3232

3333
IF(NOT ZeroCIceStorm_LIBRARY )
34-
MESSAGE(FATAL_ERROR "*** IceStorm not found")
34+
MESSAGE(FATAL_ERROR "-- ${BoldRed}IceStorm not found${ColourReset}")
3535
ENDIF()
3636

3737
IF(NOT ZeroCIceUtil_LIBRARY )
38-
MESSAGE(WARNING "*** IceUtil not found")
38+
MESSAGE("-- ${BoldYellow}IceUtil not found${ColourReset}")
3939
ENDIF()
4040

0 commit comments

Comments
 (0)