diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-06-30 17:49:00 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-06-30 17:49:00 (GMT) |
| commit | 4ba26894365dc33e6bb59ceea3bd8a0fbe4489e3 (patch) | |
| tree | 20cf58cfd59ac3d6bc3e81075b10592765faba9d /Modules/FindOpenGL.cmake | |
| parent | 9c76e082150eae48102b537c0f3f8556c18b8616 (diff) | |
| download | CMake-4ba26894365dc33e6bb59ceea3bd8a0fbe4489e3.zip CMake-4ba26894365dc33e6bb59ceea3bd8a0fbe4489e3.tar.gz CMake-4ba26894365dc33e6bb59ceea3bd8a0fbe4489e3.tar.bz2 | |
ENH: merge main tree into branch
Diffstat (limited to 'Modules/FindOpenGL.cmake')
| -rw-r--r-- | Modules/FindOpenGL.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 4c18911..9ba1938 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -95,7 +95,9 @@ ELSE (WIN32) # It's not true on OSX. IF (OPENGL_gl_LIBRARY) + IF(NOT X11_FOUND) INCLUDE(FindX11) + ENDIF(NOT X11_FOUND) IF (X11_FOUND) IF (NOT APPLE) SET (OPENGL_LIBRARIES ${X11_LIBRARIES}) |