summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLemures Lemniscati <lemures.lemniscati@gmail.com>2020-08-01 12:21:23 (GMT)
committerBrad King <brad.king@kitware.com>2020-08-06 16:36:55 (GMT)
commitaf666acdf4a73323c750f2332c35e38f5b8f4cea (patch)
treefe4c28023e5a6d9ba845a43eb774772794f9ea00
parent8edbc59e4655cb791328d27a76f37d0c8a2973ac (diff)
downloadCMake-af666acdf4a73323c750f2332c35e38f5b8f4cea.zip
CMake-af666acdf4a73323c750f2332c35e38f5b8f4cea.tar.gz
CMake-af666acdf4a73323c750f2332c35e38f5b8f4cea.tar.bz2
FindOpenGL: Drop Cygwin-specific behavior and use POSIX code path
Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/3.17.3-opengl.patch
-rw-r--r--Modules/FindOpenGL.cmake14
1 files changed, 1 insertions, 13 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index 74392da..e1271d4 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -132,19 +132,7 @@ endforeach()
set(_OpenGL_CACHE_VARS)
-if (CYGWIN)
- find_path(OPENGL_INCLUDE_DIR GL/gl.h )
- list(APPEND _OpenGL_REQUIRED_VARS OPENGL_INCLUDE_DIR)
-
- find_library(OPENGL_gl_LIBRARY opengl32 )
- find_library(OPENGL_glu_LIBRARY glu32 )
-
- list(APPEND _OpenGL_CACHE_VARS
- OPENGL_INCLUDE_DIR
- OPENGL_gl_LIBRARY
- OPENGL_glu_LIBRARY
- )
-elseif (WIN32)
+if (WIN32)
if(BORLAND)
set (OPENGL_gl_LIBRARY import32 CACHE STRING "OpenGL library for win32")