Use QGLViewer target in CMakeLists

Author: RainerKuemmerle

g2o/apps/g2o_viewer/CMakeLists.txt

@@ -2,13 +2,8 @@
 if(Qt5_FOUND)
   QT5_WRAP_UI(UI_HEADERS base_main_window.ui base_properties_widget.ui)
   QT5_WRAP_CPP(UI_SOURCES main_window.h properties_widget.h)
-
-  include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS})
-  string(APPEND qt5_includes_dirs "${Qt5Core_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS}")
-  set(MY_QT_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5OpenGL_LIBRARIES})
 endif()
 
-include_directories(SYSTEM ${QGLVIEWER_INCLUDE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(viewer_library ${G2O_LIB_TYPE}
@@ -36,7 +31,7 @@ add_executable(g2o_viewer
 
 set_target_properties(g2o_viewer PROPERTIES OUTPUT_NAME g2o_viewer)
 
-target_link_libraries(viewer_library core g2o_cli_library ${QGLVIEWER_LIBRARY} ${MY_QT_LIBRARIES} ${OPENGL_LIBRARY})
+target_link_libraries(viewer_library core g2o_cli_library QGLViewer::QGLViewer)
 target_link_libraries(viewer_library core opengl_helper)
 target_link_libraries(g2o_viewer viewer_library)
 

g2o/examples/slam2d/CMakeLists.txt

@@ -1,12 +1,3 @@
-# qt components used (also by qglviewer): Core Gui Xml OpenGL Widgets
-include_directories(SYSTEM
-    ${QGLVIEWER_INCLUDE_DIR}
-    ${Qt5Core_INCLUDE_DIRS}
-    ${Qt5Gui_INCLUDE_DIRS}
-    ${Qt5Xml_INCLUDE_DIRS}
-    ${Qt5Widgets_INCLUDE_DIRS}
-    ${Qt5OpenGL_INCLUDE_DIRS}
-)
 include_directories(${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
 QT5_WRAP_UI(UI_HEADERS base_main_window.ui)
@@ -32,10 +23,5 @@ if(Qt5_POSITION_INDEPENDENT_CODE)
 endif()
 
 target_link_libraries(slam2d_g2o core solver_eigen types_slam2d opengl_helper
-    ${QGLVIEWER_LIBRARY}
-    ${Qt5Core_LIBRARIES}
-    ${Qt5Gui_LIBRARIES}
-    ${Qt5Xml_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
-    ${Qt5OpenGL_LIBRARIES}
+    QGLViewer::QGLViewer
 )