diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-09-09 13:50:39 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-09-09 13:50:39 (GMT) |
| commit | 43d055eb7a1e24e863d598a234758c33745835db (patch) | |
| tree | 1b5488fa743e6dad070d4a5fb5333082a8c9185b /Modules | |
| parent | 3abb9e240d775178a6966d32e5f803faf56ae87c (diff) | |
| download | CMake-43d055eb7a1e24e863d598a234758c33745835db.zip CMake-43d055eb7a1e24e863d598a234758c33745835db.tar.gz CMake-43d055eb7a1e24e863d598a234758c33745835db.tar.bz2 | |
Adding GLU to the OPENGL_LIBRARIES only if it is found.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenGL.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 026c214..4cb2709 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -121,14 +121,16 @@ IF(OPENGL_INCLUDE_DIR) SET( OPENGL_XMESA_FOUND "NO" ) ENDIF(OPENGL_xmesa_INCLUDE_DIR) + SET( OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_LIBRARIES}) IF(OPENGL_glu_LIBRARY) SET( OPENGL_GLU_FOUND "YES" ) - ENDIF(OPENGL_glu_LIBRARY) + SET( OPENGL_LIBRARIES ${OPENGL_glu_LIBRARY} ${OPENGL_LIBRARIES} ) + ELSE(OPENGL_glu_LIBRARY) SET( OPENGL_GLU_FOUND "NO" ) ENDIF(OPENGL_glu_LIBRARY) SET( OPENGL_FOUND "YES" ) - SET( OPENGL_LIBRARIES ${OPENGL_glu_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_LIBRARIES}) + #The following deprecated settings are for backwards compatibility with CMake1.4 SET (OPENGL_LIBRARY ${OPENGL_LIBRARIES}) |