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

Fixed cmake erros on system with Qt4

Browse Source
This commit is contained in:
matlabbe
2016-05-04 16:51:41 -04:00
parent b8c2cd9f94
commit e1866d38af
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -172,7 +172,7 @@ ENDIF(ZLIB_FOUND)
IF(WITH_QT) IF(WITH_QT)
# If Qt is here, the GUI will be built # If Qt is here, the GUI will be built
# look for Qt5 before Qt4 # look for Qt5 before Qt4
FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui Svg) FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui Svg QUIET)
IF(NOT Qt5_FOUND) IF(NOT Qt5_FOUND)
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtSvg) FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtSvg)
ENDIF(NOT Qt5_FOUND) ENDIF(NOT Qt5_FOUND)
examples/NoEventsExample/CMakeLists.txt
+2 -2
View File
@@ -25,7 +25,7 @@ else()
FIND_PACKAGE(PCL 1.7 REQUIRED) FIND_PACKAGE(PCL 1.7 REQUIRED)
# Find Qt5 first # Find Qt5 first
FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui Svg) FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui Svg QUIET)
IF(NOT Qt5_FOUND) IF(NOT Qt5_FOUND)
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtSvg) FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtSvg)
ENDIF(NOT Qt5_FOUND) ENDIF(NOT Qt5_FOUND)
@@ -50,7 +50,7 @@ SET(LIBRARIES
INCLUDE_DIRECTORIES(${INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
IF("${MY_QT_VERSION}" STREQUAL "4") IF(QT4_FOUND)
QT4_WRAP_CPP(moc_srcs MapBuilder.h) QT4_WRAP_CPP(moc_srcs MapBuilder.h)
ELSE() ELSE()
QT5_WRAP_CPP(moc_srcs MapBuilder.h) QT5_WRAP_CPP(moc_srcs MapBuilder.h)
examples/RGBDMapping/CMakeLists.txt
+1 -1
View File
@@ -25,7 +25,7 @@ else()
FIND_PACKAGE(PCL 1.7 REQUIRED) FIND_PACKAGE(PCL 1.7 REQUIRED)
# Find Qt5 first # Find Qt5 first
FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui Svg) FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui Svg QUIET)
IF(NOT Qt5_FOUND) IF(NOT Qt5_FOUND)
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtSvg) FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtSvg)
ENDIF(NOT Qt5_FOUND) ENDIF(NOT Qt5_FOUND)
examples/WifiMapping/CMakeLists.txt
+2 -2
View File
@@ -25,7 +25,7 @@ else()
FIND_PACKAGE(PCL 1.7 REQUIRED) FIND_PACKAGE(PCL 1.7 REQUIRED)
# Find Qt5 first # Find Qt5 first
FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui Svg) FIND_PACKAGE(Qt5 COMPONENTS Widgets Core Gui Svg QUIET)
IF(NOT Qt5_FOUND) IF(NOT Qt5_FOUND)
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtSvg) FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtSvg)
ENDIF(NOT Qt5_FOUND) ENDIF(NOT Qt5_FOUND)
@@ -50,7 +50,7 @@ SET(LIBRARIES
INCLUDE_DIRECTORIES(${INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
IF("${MY_QT_VERSION}" STREQUAL "4") IF(QT4_FOUND)
QT4_WRAP_CPP(moc_srcs MapBuilder.h MapBuilderWifi.h) QT4_WRAP_CPP(moc_srcs MapBuilder.h MapBuilderWifi.h)
ELSE() ELSE()
QT5_WRAP_CPP(moc_srcs MapBuilder.h MapBuilderWifi.h) QT5_WRAP_CPP(moc_srcs MapBuilder.h MapBuilderWifi.h)