Merge pull request #38 from leggedrobotics/fix/build_warnings

Fixed build warnings.
leggedrobotics · Aug 3, 2017 · 3a08ee8 · 3a08ee8
2 parents 107a48a + b7f37e5
commit 3a08ee8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/rqt_free_gait_action/CMakeLists.txt b/rqt_free_gait_action/CMakeLists.txt
@@ -33,18 +33,20 @@ set(${PROJECT_NAME}_SRCS
   src/rqt_free_gait_action/WorkerThreadUpdateTrigger.cpp
 )
 
-set(${PROJECT_NAME}_HDRS
-  include/rqt_free_gait_action/Action.h
-  include/rqt_free_gait_action/ActionModel.h
-  include/rqt_free_gait_action/Collection.h
-  include/rqt_free_gait_action/CollectionModel.h
+set(${PROJECT_NAME}_HDRS_QT
   include/rqt_free_gait_action/FavoritePushButton.h
   include/rqt_free_gait_action/FreeGaitActionPlugin.h
   include/rqt_free_gait_action/WorkerThreadGetCollections.h
   include/rqt_free_gait_action/WorkerThreadSendAction.h
   include/rqt_free_gait_action/WorkerThreadSendActionSequence.h
   include/rqt_free_gait_action/WorkerThreadUpdateTrigger.h
 )
+set(${PROJECT_NAME}_HDRS
+  include/rqt_free_gait_action/Action.h
+  include/rqt_free_gait_action/ActionModel.h
+  include/rqt_free_gait_action/Collection.h
+  include/rqt_free_gait_action/CollectionModel.h
+)
 
 set(${PROJECT_NAME}_UIS
   resource/FreeGaitActionPlugin.ui
@@ -78,10 +80,10 @@ catkin_package(
 )
 
 if ("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
-  qt5_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS})
+  qt5_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS_QT})
   qt5_add_resources(${PROJECT_NAME}_RCC ${${PROJECT_NAME}_QRC})
 else()
-  qt4_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS})
+  qt4_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS_QT})
   qt4_add_resources(${PROJECT_NAME}_RCC ${${PROJECT_NAME}_QRC})
 endif()
 
@@ -102,6 +104,7 @@ include_directories(${${PROJECT_NAME}_INCLUDE_DIRECTORIES}
 
 add_library(${PROJECT_NAME}
   ${${PROJECT_NAME}_SRCS}
+  ${${PROJECT_NAME}_HDRS_QT}
   ${${PROJECT_NAME}_HDRS}
   ${${PROJECT_NAME}_MOCS}
   ${${PROJECT_NAME}_UIS_H}

diff --git a/rqt_free_gait_monitor/CMakeLists.txt b/rqt_free_gait_monitor/CMakeLists.txt
@@ -32,13 +32,15 @@ set(${PROJECT_NAME}_SRCS
   src/rqt_free_gait_monitor/ClickableLabel.cpp
 )
 
-set(${PROJECT_NAME}_HDRS
+set(${PROJECT_NAME}_HDRS_QT
   include/${PROJECT_NAME}/FreeGaitMonitorPlugin.h
-  include/rqt_free_gait_monitor/CircularBuffer.h
   include/rqt_free_gait_monitor/WorkerThreadPausePlay.h
   include/rqt_free_gait_monitor/WorkerThreadStop.h
   include/rqt_free_gait_monitor/ClickableLabel.h
 )
+set(${PROJECT_NAME}_HDRS
+  include/rqt_free_gait_monitor/CircularBuffer.h
+)
 
 set(${PROJECT_NAME}_UIS
   resource/FreeGaitMonitorPlugin.ui
@@ -82,10 +84,10 @@ catkin_package(
 )
 
 if ("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
-  qt5_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS})
+  qt5_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS_QT})
   qt5_add_resources(${PROJECT_NAME}_RCC ${${PROJECT_NAME}_QRC})
 else()
-  qt4_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS})
+  qt4_wrap_cpp(${PROJECT_NAME}_MOCS ${${PROJECT_NAME}_HDRS_QT})
   qt4_add_resources(${PROJECT_NAME}_RCC ${${PROJECT_NAME}_QRC})
 endif()
 
@@ -107,6 +109,7 @@ include_directories(${${PROJECT_NAME}_INCLUDE_DIRECTORIES}
 
 add_library(${PROJECT_NAME}
   ${${PROJECT_NAME}_SRCS}
+  ${${PROJECT_NAME}_HDRS_QT}
   ${${PROJECT_NAME}_HDRS}
   ${${PROJECT_NAME}_MOCS}
   ${${PROJECT_NAME}_UIS_H}