Skip to content

Commit 89498d5

Browse files
kholtmannkholtmann
authored
Merge pull request #47 from ethz-asl/fix/gui_cmakelist
Fix/gui cmakelist
2 parents 0ea7136 + 59acb1b commit 89498d5

File tree

11 files changed

+114
-76
lines changed

11 files changed

+114
-76
lines changed

‎ethz_piksi_ros/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>ethz_piksi_ros</name>
4-
<version>1.6.1</version>
4+
<version>1.6.2</version>
55
<description>Meta-package for the ethz_piksi_ros repository.</description>
66

77
<maintainer email="[email protected]">Marco Tranzatto</maintainer>

‎jenkins-pipeline‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
library 'continuous_integration_pipeline'
2-
ciPipeline("--ignore ethz_piksi_ros piksi_v2_rtk_ros rqt_gps_rtk_plugin utils")
2+
ciPipeline("--ignore ethz_piksi_ros piksi_v2_rtk_ros utils")

‎piksi_multi_rtk_ros/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>piksi_multi_rtk_ros</name>
4-
<version>1.6.1</version>
4+
<version>1.6.2</version>
55
<description>
66
ROS driver for Piksi Multi RTK GPS Receiver.
77
</description>

‎piksi_rtk_kml/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>piksi_rtk_kml</name>
4-
<version>1.6.1</version>
4+
<version>1.6.2</version>
55
<description>
66
ROS node to write KML file from Piksi messages.
77
</description>

‎piksi_rtk_msgs/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>piksi_rtk_msgs</name>
4-
<version>1.6.1</version>
4+
<version>1.6.2</version>
55
<description>
66
Package containing messages for Piksi RTK GPS ROS Driver.
77
</description>

‎rqt_gps_rtk_plugin/CMakeLists.txt‎

Lines changed: 90 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,146 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(rqt_gps_rtk_plugin)
33

4-
# Set compiler flags
5-
set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
4+
## Use C++11
5+
## By adding -Wall and -Werror, the compiler does not ignore warnings anymore,
6+
## enforcing cleaner code.
7+
add_definitions(-std=c++11 -Wall -Werror)
68

9+
# Load catkin and all dependencies required for this package
710
find_package(catkin REQUIRED COMPONENTS
8-
any_worker
9-
rqt_gui
10-
rqt_gui_cpp
11-
piksi_rtk_msgs
12-
sensor_msgs
11+
rqt_gui
12+
rqt_gui_cpp
13+
any_worker
14+
piksi_rtk_msgs
15+
sensor_msgs
16+
1317
)
1418

15-
if("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
19+
if ("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
1620
find_package(Qt5Widgets REQUIRED)
1721
else()
18-
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
22+
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL REQUIRED)
1923
include(${QT_USE_FILE})
2024
endif()
2125

22-
catkin_python_setup()
26+
# Flags
27+
SET(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
2328

24-
###########
25-
# sources #
26-
###########
27-
set(rqt_gps_rtk_plugin_SRCS
28-
src/rqt_gps_rtk_plugin/GpsRtkPlugin.cpp
29+
set(${PROJECT_NAME}_SRCS
30+
src/${PROJECT_NAME}/GpsRtkPlugin.cpp
2931
)
30-
###########
31-
32-
3332

34-
###########
35-
# headers #
36-
###########
37-
set(rqt_gps_rtk_plugin_HDRS
38-
include/rqt_gps_rtk_plugin/GpsRtkPlugin.hpp
33+
set(${PROJECT_NAME}_HDRS
34+
include/${PROJECT_NAME}/GpsRtkPlugin.hpp
3935
)
40-
###########
41-
4236

37+
set(${PROJECT_NAME}_UIS
38+
resource/gps_rtk_plugin.ui
39+
)
4340

44-
############
45-
# ui files #
46-
############
47-
set(rqt_gps_rtk_plugin_UIS
48-
resource/gps_rtk_plugin.ui
41+
set(ui_INCLUDE_DIR
42+
"${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/${PROJECT_NAME}"
4943
)
50-
############
5144

52-
set(rqt_gps_rtk_plugin_INCLUDE_DIRECTORIES
53-
include
54-
${CMAKE_CURRENT_BINARY_DIR}
45+
set(${PROJECT_NAME}_INCLUDE_DIRECTORIES
46+
include
47+
${ui_INCLUDE_DIR}/..
5548
)
5649

50+
if(NOT EXISTS ${ui_INCLUDE_DIR})
51+
file(MAKE_DIRECTORY ${ui_INCLUDE_DIR})
52+
endif()
53+
5754
catkin_package(
55+
INCLUDE_DIRS
56+
${${PROJECT_NAME}_INCLUDE_DIRECTORIES}
5857
LIBRARIES ${PROJECT_NAME}
5958
CATKIN_DEPENDS
60-
any_worker
6159
rqt_gui
6260
rqt_gui_cpp
61+
any_worker
6362
piksi_rtk_msgs
6463
sensor_msgs
65-
DEPENDS
64+
6665
)
6766

68-
if("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
69-
qt5_wrap_cpp(rqt_gps_rtk_plugin_MOCS ${rqt_gps_rtk_plugin_HDRS})
70-
qt5_wrap_ui(rqt_gps_rtk_plugin_UIS_H ${rqt_gps_rtk_plugin_UIS})
67+
# include directories before wrap cpp
68+
include_directories(${${PROJECT_NAME}_INCLUDE_DIRECTORIES}
69+
${${PROJECT_NAME}_INCLUDE_DIRECTORIES}
70+
${catkin_INCLUDE_DIRS}
71+
)
72+
73+
if ("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
74+
include_directories(${Qt5Widgets_INCLUDE_DIRS})
75+
add_definitions(${Qt5Widgets_DEFINITIONS})
76+
qt5_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS})
77+
#qt5_add_resources(${PROJECT_NAME}_RCC ${${PROJECT_NAME}_QRC})
7178
else()
72-
qt4_wrap_cpp(rqt_gps_rtk_plugin_MOCS ${rqt_gps_rtk_plugin_HDRS})
73-
qt4_wrap_ui(rqt_gps_rtk_plugin_UIS_H ${rqt_gps_rtk_plugin_UIS})
79+
qt4_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS})
80+
#qt4_add_resources(${PROJECT_NAME}_RCC ${${PROJECT_NAME}_QRC})
7481
endif()
7582

76-
include_directories(
77-
${rqt_gps_rtk_plugin_INCLUDE_DIRECTORIES}
78-
${catkin_INCLUDE_DIRS}
79-
)
80-
83+
# ensure generated header files are being created in the devel space
84+
set(_cmake_current_binary_dir "${CMAKE_CURRENT_BINARY_DIR}")
85+
set(CMAKE_CURRENT_BINARY_DIR ${ui_INCLUDE_DIR})
86+
if("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
87+
qt5_wrap_ui(${PROJECT_NAME}_UIS_H ${${PROJECT_NAME}_UIS})
88+
else()
89+
qt4_wrap_ui(${PROJECT_NAME}_UIS_H ${${PROJECT_NAME}_UIS})
90+
endif()
91+
set(CMAKE_CURRENT_BINARY_DIR "${_cmake_current_binary_dir}")
8192

82-
add_library(rqt_gps_rtk_plugin
83-
${rqt_gps_rtk_plugin_SRCS}
84-
${rqt_gps_rtk_plugin_MOCS}
85-
${rqt_gps_rtk_plugin_UIS_H}
93+
add_library(${PROJECT_NAME}
94+
${${PROJECT_NAME}_SRCS}
95+
${${PROJECT_NAME}_HDRS}
96+
${${PROJECT_NAME}_MOCS}
97+
${${PROJECT_NAME}_UIS_H}
8698
)
8799

88-
target_link_libraries(rqt_gps_rtk_plugin
89-
${catkin_LIBRARIES}
100+
target_link_libraries(${PROJECT_NAME}
101+
${catkin_LIBRARIES}
90102
)
91103

92-
if("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
104+
if ("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
93105
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
94106
else()
95107
target_link_libraries(${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
96108
endif()
97109

110+
add_dependencies(${PROJECT_NAME}
111+
${catkin_EXPORTED_TARGETS}
112+
)
98113

99114
find_package(class_loader)
100-
class_loader_hide_library_symbols(rqt_gps_rtk_plugin)
101-
115+
class_loader_hide_library_symbols(${PROJECT_NAME})
102116

103117
install(FILES plugin.xml
104-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
118+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
105119
)
106120

107-
install(TARGETS rqt_gps_rtk_plugin
108-
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
109-
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
110-
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
121+
install(TARGETS ${PROJECT_NAME}
122+
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
123+
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
124+
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
111125
)
112126

113-
install(PROGRAMS scripts/rqt_gps_rtk_plugin
114-
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
127+
install(PROGRAMS scripts/${PROJECT_NAME}
128+
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
115129
)
116130

117131
install(DIRECTORY include/${PROJECT_NAME}/
118-
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
132+
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
133+
)
134+
135+
# uncomment, if this widget will be used by any other QObject (e.g., a widget)
136+
install(DIRECTORY ${ui_INCLUDE_DIR}/
137+
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
138+
)
139+
140+
install(
141+
DIRECTORY resource
142+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
143+
# FILES_MATCHING
144+
# PATTERN "*.png"
145+
# PATTERN "*.svg"
119146
)

‎rqt_gps_rtk_plugin/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Dependencies
77
------
88
[piksi_rtk_msgs](https://github.com/ethz-asl/mav_rtk_gps/tree/master/piksi_rtk_msgs)
99
[Qt](https://wiki.qt.io/Install_Qt_5_on_Ubuntu)
10+
[any_node](https://bitbucket.org/leggedrobotics/any_common/src/master/any_node/)
1011

1112
General Usage
1213
------

‎rqt_gps_rtk_plugin/include/rqt_gps_rtk_plugin/GpsRtkPlugin.hpp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,31 @@
22
#define GPSRTKPLUGIN_H
33

44
#include <rqt_gui_cpp/plugin.h>
5-
#include <ui_gps_rtk_plugin.h>
5+
6+
// Qt
67
#include <QWidget>
8+
#include <QString>
9+
10+
// ui
11+
#include <rqt_gps_rtk_plugin/ui_gps_rtk_plugin.h>
712

13+
// std
814
#include <algorithm>
915
#include <unistd.h>
1016
#include <memory>
1117

18+
// ros
1219
#include <ros/ros.h>
20+
21+
// messages
1322
#include <piksi_rtk_msgs/ReceiverState_V2_3_15.h>
1423
#include <piksi_rtk_msgs/BaselineNed.h>
1524
#include <piksi_rtk_msgs/InfoWifiCorrections.h>
1625
#include <piksi_rtk_msgs/UtcTimeMulti.h>
1726
#include <piksi_rtk_msgs/AgeOfCorrections.h>
1827
#include <sensor_msgs/NavSatFix.h>
1928

29+
// worker
2030
#include <any_worker/Worker.hpp>
2131

2232
constexpr double kSignalStrengthScalingFactor = 4.0;

‎rqt_gps_rtk_plugin/package.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>rqt_gps_rtk_plugin</name>
4-
<version>1.6.1</version>
4+
<version>1.6.2</version>
55
<description>The rqt_gps_rtk_plugin package</description>
66

77
<maintainer email="[email protected]">Kai Holtmann</maintainer>
@@ -15,7 +15,6 @@
1515
<depend>piksi_rtk_msgs</depend>
1616
<depend>sensor_msgs</depend>
1717

18-
1918
<!-- The export tag contains other, unspecified, tags -->
2019
<export>
2120
<architecture_independent/>

‎rqt_gps_rtk_plugin/resource/gps_rtk_plugin.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>GpsRtkInfo</string>
14+
<string>GpsRtkPlugin</string>
1515
</property>
1616
<layout class="QHBoxLayout" name="horizontalLayout_17">
1717
<item>

0 commit comments

Comments
 (0)