Merge branch 'release-6.10' into release-6.11

# Conflicts: # CHANGELOG.md # package.xml
dartsim · Jul 7, 2021 · 2cb0ec4 · 2cb0ec4
2 parents 0799362 + 2765390
commit 2cb0ec4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * GUI
 
   * Fixed incorrect MultiSphereConvexHull rendering: [#1579](https://github.com/dartsim/dart/pull/1579)
+  * Use GLVND over the legacy OpenGL libraries: [#1584](https://github.com/dartsim/dart/pull/1584)
 
 ### [DART 6.10.1 (2021-04-19)](https://github.com/dartsim/dart/milestone/65?closed=1)
 

diff --git a/cmake/DARTFindOpenGL.cmake b/cmake/DARTFindOpenGL.cmake
@@ -8,10 +8,9 @@
 
 cmake_policy(PUSH)
 
-# Stick to the legacy GL library until we need GLVND
-# (see: https://cmake.org/cmake/help/git-stage/policy/CMP0072.html)
+# Use GLVND over the legacy OpenGL libraries
 if(POLICY CMP0072)
-  cmake_policy(SET CMP0072 OLD)
+  cmake_policy(SET CMP0072 NEW)
 endif()
 
 # Use OpenGL config if available
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
     * GUI
       * Fixed incorrect MultiSphereConvexHull rendering: [#1579](https://github.com/dartsim/dart/pull/1579)
+      * Use GLVND over the legacy OpenGL libraries: [#1584](https://github.com/dartsim/dart/pull/1584)
     ### [DART 6.10.1 (2021-04-19)](https://github.com/dartsim/dart/milestone/65?closed=1)
@@ Expand Down @@