i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-04 00:37:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to link with rtabmap 0.11.5 (RTABMAP_QT_VERSION cmake variable set)

Browse Source
This commit is contained in:
matlabbe
2016-05-09 11:19:07 -04:00
parent 5fec584eda
commit 439eff4b35
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+20 -11
View File
@@ -18,21 +18,30 @@ find_package(rviz)
## System dependencies are found with CMake's conventions ## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system) # find_package(Boost REQUIRED COMPONENTS system)
find_package(RTABMap 0.11.4 REQUIRED) find_package(RTABMap 0.11.5 REQUIRED)
find_package(OpenCV REQUIRED) find_package(OpenCV REQUIRED)
#Qt stuff #Qt stuff
# If Qt is here, rtabmapviz will be built # If librtabmap_gui.so is found, rtabmapviz will be built
# look for Qt5 before Qt4 # If rviz is found, plugins will be built
FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui QUIET) IF(RTABMAP_GUI OR rviz_FOUND)
IF(Qt5_FOUND) IF(RTABMAP_QT_VERSION EQUAL 4)
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui) FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
ENDIF(Qt5_FOUND) INCLUDE(${QT_USE_FILE})
ELSE()
IF(QT4_FOUND) IF(RTABMAP_GUI)
INCLUDE(${QT_USE_FILE}) FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui REQUIRED)
ENDIF(QT4_FOUND) ELSE()
# For rviz plugins, look for Qt5 before Qt4
FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui QUIET)
IF(NOT Qt5_FOUND)
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
INCLUDE(${QT_USE_FILE})
ENDIF(NOT Qt5_FOUND)
ENDIF()
ENDIF()
ENDIF(RTABMAP_GUI OR rviz_FOUND)
## We also use Ogre ## We also use Ogre
include($ENV{ROS_ROOT}/core/rosbuild/FindPkgConfig.cmake) include($ENV{ROS_ROOT}/core/rosbuild/FindPkgConfig.cmake)
package.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<package> <package>
<name>rtabmap_ros</name> <name>rtabmap_ros</name>
<version>0.11.4</version> <version>0.11.5</version>
<description>RTAB-Map's ros-pkg. RTAB-Map is a RGB-D SLAM approach with real-time constraints.</description> <description>RTAB-Map's ros-pkg. RTAB-Map is a RGB-D SLAM approach with real-time constraints.</description>
<maintainer email="[email protected]">Mathieu Labbe</maintainer> <maintainer email="[email protected]">Mathieu Labbe</maintainer>
<author>Mathieu Labbe</author> <author>Mathieu Labbe</author>