浏览代码

Merge topic 'FindGLUT-remove-undocumented-vars'

6c053e68df FindGLUT: Remove undocumented variables GLUT_INCLUDE_PATH and GLUT_LIBRARY

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7273
Brad King 3 年之前
父节点
当前提交
6daf38dec6
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. 5 0
      Help/release/dev/FindGLUT-remove-undocumented-vars.rst
  2. 0 4
      Modules/FindGLUT.cmake

+ 5 - 0
Help/release/dev/FindGLUT-remove-undocumented-vars.rst

@@ -0,0 +1,5 @@
+FindGLUT-remove-undocumented-vars
+---------------------------------
+
+* The :module:`FindGLUT` module no longer provides the undocumented
+  result variables ``GLUT_LIBRARY`` and ``GLUT_INCLUDE_PATH``.

+ 0 - 4
Modules/FindGLUT.cmake

@@ -275,8 +275,4 @@ if (GLUT_FOUND)
         PROPERTY INTERFACE_LINK_LIBRARIES GLUT::Cocoa)
     endif()
   endif()
-
-  #The following deprecated settings are for backwards compatibility with CMake1.4
-  set (GLUT_LIBRARY ${GLUT_LIBRARIES})
-  set (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIRS})
 endif()