diff options
author | simon <none@none> | 2013-04-11 16:04:21 -0700 |
---|---|---|
committer | simon <none@none> | 2013-04-11 16:04:21 -0700 |
commit | c7bab8ab8b25249d1f8f87746b50fce4820f542a (patch) | |
tree | f10f811e0a03002b4c545eb5c51f99d7c5b83a5b /indra/cmake/OpenGL.cmake | |
parent | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (diff) | |
parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) |
Merge
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) + |