Skip to content

Commit

Permalink
relax Qt-version requirement
Browse files Browse the repository at this point in the history
Minor Qt version updates are ABI-compatible with each other:
https://wiki.qt.io/Qt-Version-Compatibility
  • Loading branch information
rhaschke committed May 23, 2016
1 parent ed3b6e7 commit 5301411
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions moveit_setup_assistant/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ link_directories(${catkin_LIBRARY_DIRS})

# Qt Stuff
if(rviz_QT_VERSION VERSION_LESS "5")
find_package(Qt4 ${rviz_QT_VERSION} EXACT REQUIRED QtCore QtGui)
find_package(Qt4 ${rviz_QT_VERSION} REQUIRED QtCore QtGui)
include(${QT_USE_FILE})
else()
find_package(Qt5 ${rviz_QT_VERSION} EXACT REQUIRED Core Widgets)
find_package(Qt5 ${rviz_QT_VERSION} REQUIRED Core Widgets)
set(QT_LIBRARIES Qt5::Widgets)
endif()
# Instruct CMake to run moc automatically when needed.
Expand Down

0 comments on commit 5301411

Please sign in to comment.