diff options
author | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
commit | 56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (patch) | |
tree | c1b61940e39d615201e18259bcab1762c5a8c655 /indra/cmake/OpenGL.cmake | |
parent | f684d897f532bcba87cda1f72bd19efac82f6cb6 (diff) | |
parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/cmake/OpenGL.cmake')
-rw-r--r-- | indra/cmake/OpenGL.cmake | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index 0a3dd976b4..2259c99293 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -1,8 +1,12 @@ # -*- cmake -*- + +include(Variables) include(Prebuilt) -if (NOT STANDALONE) - use_prebuilt_binary(glext) - use_prebuilt_binary(glh_linear) - set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) -endif (NOT STANDALONE) +if (BUILD_HEADLESS) + SET(OPENGL_glu_LIBRARY GLU) + SET(OPENGL_HEADLESS_LIBRARIES OSMesa16 dl GLU) +endif (BUILD_HEADLESS) + +include(FindOpenGL) + |