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

cmake qt5 cleanup #1008

Merged
merged 3 commits into from
May 17, 2016
Merged

cmake qt5 cleanup #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0608ca8
make CMakeLists.txt Qt-version agnostic in subdirs
rhaschke May 14, 2016
11678cf
removed obsolete MOC_FILES variables
rhaschke May 14, 2016
7807f16
added missing dependency
rhaschke May 17, 2016
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
16 changes: 6 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,14 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
option(UseQt5 "UseQt5" ON)
if (UseQt5)
find_package(Qt5 REQUIRED COMPONENTS Core Widgets OpenGL)
# set variable names already used with Qt4
set(QT_LIBRARIES Qt5::Widgets)
set(QTVERSION ${Qt5Widgets_VERSION})
else()
find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtOpenGL)
include(${QT_USE_FILE})
endif()
add_definitions(-DQT_NO_KEYWORDS)

find_package(catkin REQUIRED
COMPONENTS
Expand Down Expand Up @@ -153,17 +158,8 @@ if(NOT OGRE_OV_LIBRARIES_ABS)
set(OGRE_OV_LIBRARIES_ABS ${OGRE_OV_LIBRARIES})
endif()

if(NOT UseQt5)
include(${QT_USE_FILE})
endif()
add_definitions(-DQT_NO_KEYWORDS)

# Set the Qt version for use in the extras file.
if(UseQt5)
set(rviz_QT_VERSION ${Qt5Widgets_VERSION})
else()
set(rviz_QT_VERSION ${QTVERSION})
endif()
set(rviz_QT_VERSION ${QTVERSION})

# This variable controls the target name of the default plugin library.
# It is used in the extras file (processed in caktin_package(...)) and the
Expand Down
1 change: 0 additions & 1 deletion src/image_view/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
add_executable(rviz_image_view
image_view.cpp
main.cpp
${MOC_FILES}
)

target_link_libraries(rviz_image_view
Expand Down
14 changes: 2 additions & 12 deletions src/rviz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,23 +122,18 @@ add_library( ${PROJECT_NAME}
yaml_config_writer.cpp

${ENV_CONFIG_FILE}
${MOC_FILES}
)

target_link_libraries(${PROJECT_NAME}
${Boost_LIBRARIES}
${catkin_LIBRARIES}
${QT_LIBRARIES}
${OGRE_OV_LIBRARIES_ABS}
${OPENGL_LIBRARIES}
${rviz_ADDITIONAL_LIBRARIES}
assimp
yaml-cpp
)
if(UseQt5)
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
else()
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
endif()


if(APPLE)
Expand All @@ -148,12 +143,7 @@ endif(APPLE)
########### The rviz executable ###########
add_executable(executable main.cpp)

target_link_libraries(executable ${PROJECT_NAME} ${OGRE_OV_LIBRARIES_ABS})
if(UseQt5)
target_link_libraries(executable Qt5::Widgets)
else()
target_link_libraries(executable ${QT_LIBRARIES})
endif()
target_link_libraries(executable ${PROJECT_NAME} ${QT_LIBRARIES} ${OGRE_OV_LIBRARIES_ABS})

set_target_properties(executable
PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
Expand Down
1 change: 0 additions & 1 deletion src/rviz/default_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ set(SOURCE_FILES
view_controllers/fps_view_controller.cpp
wrench_display.cpp
wrench_visual.cpp
${MOC_FILES}
)

add_library(${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME} ${SOURCE_FILES})
Expand Down
34 changes: 1 addition & 33 deletions src/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ catkin_add_gtest(property_test
${MOC_MOCK_PROPERTY_CHANGE_RECEIVER}
)
target_link_libraries(property_test rviz ${catkin_LIBRARIES} ${QT_LIBRARIES})
if (UseQt5)
target_link_libraries(property_test Qt5::Widgets)
endif()

# TODO(wjwwood): Fix this test, it used to use a set of Mock classes, but
# has since undergone a lot of changes and it no longer works.
Expand Down Expand Up @@ -86,82 +83,53 @@ add_dependencies(tests send_grid_cells)
# This is a test program that uses the rviz panel interface.
add_executable(render_panel_test render_panel_test.cpp)
target_link_libraries(render_panel_test rviz ${catkin_LIBRARIES} ${QT_LIBRARIES})
if (UseQt5)
target_link_libraries(render_panel_test Qt5::Widgets)
endif()
add_dependencies(tests render_panel_test)

# This is an executable which uses the rviz new display diaglog interface.
add_executable(new_display_dialog_test new_display_dialog_test.cpp)
target_link_libraries(new_display_dialog_test rviz ${catkin_LIBRARIES} ${QT_LIBRARIES})
if (UseQt5)
target_link_libraries(new_display_dialog_test Qt5::Widgets)
endif()
add_dependencies(tests new_display_dialog_test)

# This is an executable which uses the rviz color editor test.
add_executable(color_editor_test color_editor_test.cpp)
target_link_libraries(color_editor_test rviz ${catkin_LIBRARIES} ${QT_LIBRARIES})
if (UseQt5)
target_link_libraries(color_editor_test Qt5::Widgets)
endif()
add_dependencies(tests color_editor_test)

# This is a modified version of the property test.
catkin_add_gtest(property_with_ros_spinner_test
property_test.cpp
ros_spinner.cpp
mock_property_change_receiver.cpp
${PROPERTY_TEST_MOC_FILES}
${MOC_MOCK_PROPERTY_CHANGE_RECEIVER}
)
target_link_libraries(property_with_ros_spinner_test rviz ${catkin_LIBRARIES} ${QT_LIBRARIES})
if (UseQt5)
target_link_libraries(property_with_ros_spinner_test Qt5::Widgets)
endif()
add_dependencies(tests property_with_ros_spinner_test)

# This is an executable that uses the line_edit_with_button property interface.
add_executable(line_edit_with_button_test line_edit_with_button_test.cpp)
target_link_libraries(line_edit_with_button_test rviz ${catkin_LIBRARIES} ${QT_LIBRARIES})
if (UseQt5)
target_link_libraries(line_edit_with_button_test Qt5::Widgets)
endif()
add_dependencies(tests line_edit_with_button_test)

# This is an executable which tests the connect/disconnect behavior of signals and slots in Qt.
add_executable(connect_test connect_test.cpp ${MOC_FILES})
add_executable(connect_test connect_test.cpp)
target_link_libraries(connect_test ${QT_LIBRARIES})
if (UseQt5)
target_link_libraries(connect_test Qt5::Widgets)
endif()
add_dependencies(tests connect_test)

# This is a GTest which tests the display configuration.
catkin_add_gtest(config_test config_test.cpp ../rviz/uniform_string_stream.cpp ../rviz/config.cpp)
if (UseQt5)
target_link_libraries(config_test Qt5::Widgets)
endif()
target_link_libraries(config_test ${QT_LIBRARIES})

# This is an acceptance test executable which renders points.
add_executable(render_points_test
render_points_test.cpp
../rviz/ogre_helpers/orbit_camera.cpp
${RENDER_POINTS_TEST_MOC_FILES}
)
target_link_libraries(render_points_test rviz ${catkin_LIBRARIES} ${QT_LIBRARIES})
if (UseQt5)
target_link_libraries(render_points_test Qt5::Widgets)
endif()
add_dependencies(tests render_points_test)

# This is an example application which creates two ogre render windows.
add_executable(two_render_widgets two_render_widgets.cpp)
target_link_libraries(two_render_widgets rviz ${catkin_LIBRARIES} ${QT_LIBRARIES})
if (UseQt5)
target_link_libraries(two_render_widgets Qt5::Widgets)
endif()
add_dependencies(tests two_render_widgets)

# This is a GTest which tests the STL loader
Expand Down