Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated QT commands to match version Qt5 in ROS Noetic. See CMakeLists.txt comments… #207

Open
wants to merge 1 commit into
base: indigo-devel
Choose a base branch
from
Open

Updated QT commands to match version Qt5 in ROS Noetic. See CMakeLists.txt comments… #207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions stdr_gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,24 @@ find_package(catkin REQUIRED COMPONENTS
nav_msgs
)

# Added
catkin_package()

include_directories( include
${catkin_INCLUDE_DIRS}
)

find_package(Qt4 REQUIRED COMPONENTS
QtCore
QtGui
QtUiTools
)
find_package(Qt5 REQUIRED COMPONENTS
Core
Gui
UiTools
)

set (Qt5QtCore_DIR /usr/lib/x86_64-linux-gnu/cmake)

ADD_DEFINITIONS(-DQT_NO_KEYWORDS)

include(${QT_USE_FILE})
include_directories(${QT_USE_FILE})

include_directories(
${CMAKE_CURRENT_BINARY_DIR}
Expand Down Expand Up @@ -60,13 +65,14 @@ set(QT_FORMS
ui/thermalSensorProperties.ui ui/soundSensorProperties.ui
)

QT4_WRAP_UI(QT_FORMS_HPP ${QT_FORMS})
#QT_WRAP_UI(QT_FORMS_HPP ${QT_FORMS})
qt5_wrap_ui(QT_FORMS_HPP ${QT_FORMS})

QT_WRAP_CPP(stdr_gui_node SAMPLE_MOC_SRCS include/stdr_gui/stdr_gui_controller.h)
QT_WRAP_CPP(stdr_gui_node SAMPLE_MOC_SRCS include/stdr_gui/stdr_gui_connector.h)
QT_WRAP_CPP(stdr_gui_node SAMPLE_MOC_SRCS include/stdr_gui/stdr_info_connector.h)
QT_WRAP_CPP(stdr_gui_node SAMPLE_MOC_SRCS include/stdr_gui/stdr_map_connector.h)
QT_WRAP_CPP(stdr_gui_node SAMPLE_MOC_SRCS include/stdr_gui/stdr_robot_creator/stdr_robot_creator_connector.h)
qt5_wrap_cpp(stdr_gui_node SAMPLE_MOC_SRCS include/stdr_gui/stdr_gui_controller.h)
qt5_wrap_cpp(stdr_gui_node SAMPLE_MOC_SRCS include/stdr_gui/stdr_gui_connector.h)
qt5_wrap_cpp(stdr_gui_node SAMPLE_MOC_SRCS include/stdr_gui/stdr_info_connector.h)
qt5_wrap_cpp(stdr_gui_node SAMPLE_MOC_SRCS include/stdr_gui/stdr_map_connector.h)
qt5_wrap_cpp(stdr_gui_node SAMPLE_MOC_SRCS include/stdr_gui/stdr_robot_creator/stdr_robot_creator_connector.h)

#----------------------------------------------------------------------------------------------------#

Expand Down Expand Up @@ -115,7 +121,7 @@ add_executable(stdr_gui_node
add_dependencies(stdr_gui_node ${stdr_msgs_EXPORTED_TARGETS}) # Wait for stdr_msgs to build
target_link_libraries(stdr_gui_node
${catkin_LIBRARIES}
${QT_LIBRARIES}
# ${QT_LIBRARIES}
)

# Install launch files
Expand Down