diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-04 03:12:48 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-04 03:12:48 +0000 |
| commit | c9ab9590aa1d44ea139b16e7ffcb1461d928bdd5 (patch) | |
| tree | c735cd065521eb5b2d719f78e1685c090b265ea6 /indra/cmake/OpenGL.cmake | |
| parent | 8c0aa31536c447edb6ef4fbee43f99debf593a20 (diff) | |
Removing server-related cmake cruft. Fixing libGLU warnings on linux.
Diffstat (limited to 'indra/cmake/OpenGL.cmake')
| -rw-r--r-- | indra/cmake/OpenGL.cmake | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index 0a3dd976b4..bafb2a460f 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -1,8 +1,15 @@ # -*- cmake -*- + +#if (INSTALL_PROPRIETARY) +# set(HEADLESS ON CACHE BOOL "Use headless mesa library.") +#endif (INSTALL_PROPRIETARY) + 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 (LINUX AND NOT STANDALONE) + use_prebuilt_binary(mesa) + SET(OPENGL_glu_LIBRARY GLU) +endif (LINUX AND NOT STANDALONE) + +include(FindOpenGL) + |