From 43d055eb7a1e24e863d598a234758c33745835db Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 9 Sep 2002 09:50:39 -0400 Subject: [PATCH] Adding GLU to the OPENGL_LIBRARIES only if it is found. --- Modules/FindOpenGL.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 026c214b4..4cb270922 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})