Merge branch 'master' of https://github.com/ilpincy/argos3

ilpincy · Apr 30, 2024 · 0b1a99d · 0b1a99d
2 parents d7a33fe + 0345f1c
commit 0b1a99d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/cmake/ARGoSPackaging.cmake b/src/cmake/ARGoSPackaging.cmake
@@ -51,7 +51,7 @@ set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${AR
 #
 # Configuration for the Debian generator
 #
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "gcc (>= 5.4), g++ (>= 5.4), cmake (>= 3.5), freeglut3-dev (>= 2.6.0), qt5-default (>= 5.5.1), libxi-dev, libxmu-dev, libfreeimage-dev (>= 3.15), libfreeimageplus-dev (>= 3.15), liblua5.3-dev, lua5.3")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "gcc (>= 5.4), g++ (>= 5.4), cmake (>= 3.5), freeglut3-dev (>= 2.6.0), libqt6opengl6-dev, libxi-dev, libxmu-dev, libfreeimage-dev (>= 3.15), libfreeimageplus-dev (>= 3.15), liblua5.3-dev, lua5.3")
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE})
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_MAINTAINER})

diff --git a/src/cmake/FindARGoSQTOpenGL.cmake b/src/cmake/FindARGoSQTOpenGL.cmake
@@ -29,7 +29,7 @@ if(NOT ARGOS_FORCE_NO_QTOPENGL)
   # Look for GLUT
   find_package(GLUT)
   if(GLUT_FOUND)
-    list(APPEND ARGOS_QTOPENGL_INCLUDE_DIRS ${GLUT_INCLUDE_DIR})
+    list(APPEND ARGOS_QTOPENGL_INCLUDE_DIRS ${GLUT_INCLUDE_DIRS})
     list(APPEND ARGOS_QTOPENGL_LIBRARIES ${GLUT_LIBRARIES})
   else(GLUT_FOUND)
     message(STATUS "GLUT not found.")