Fix for point_cloud_editor using QT5

It's using QT_QTOPENGL_INCLUDE_DIR for Qt4 and Qt5 adds the headers directly of the widgets.
PointCloudLibrary · Sep 29, 2014 · b5be0fd · b5be0fd
1 parent 7039581
commit b5be0fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/mainWindow.h b/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/mainWindow.h
@@ -45,6 +45,13 @@
 
 #include <QtGui>
 #include <QMainWindow>
+#include <QActionGroup>
+#include <QSpinBox>
+#include <QSlider>
+#include <QMessageBox>
+#include <QMenu>
+#include <QMenuBar>
+#include <QToolBar>
 #include <pcl/apps/point_cloud_editor/localTypes.h>
 
 // Forward declaration to prevent circular inclusion

diff --git a/cmake/pcl_find_qt5.cmake b/cmake/pcl_find_qt5.cmake
@@ -54,6 +54,8 @@ if(Qt5Core_FOUND)
     # FIXME: CMake's automoc seems to break macosx parallel builds.
     # set(CMAKE_AUTOMOC ON)
     # set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+    set(QT_QTOPENGL_INCLUDE_DIR Qt5OpenGL_INCLUDE_DIRS)
 
     # Replace qt4 macros.
     macro(qt4_wrap_cpp)
@@ -73,4 +75,4 @@ if(Qt5Core_FOUND)
 
     # Trick the remainder of the build system.
     set(QT4_FOUND TRUE)
-endif()
+endif()