diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-04 06:29:07 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-04 06:29:07 +0000 |
| commit | 21df924a10c1c32f7fc28bb29b20dc2179863b24 (patch) | |
| tree | 1e3786d1da78129a73903bfa083e52423fe89a68 /indra/cmake/OpenGL.cmake | |
| parent | 6d613b61d76c1909021983901920b6b1dc2c80f4 (diff) | |
Building headless and non-headless libraries side-by-side, removing the need for the BAKING cmake setting.
Diffstat (limited to 'indra/cmake/OpenGL.cmake')
| -rw-r--r-- | indra/cmake/OpenGL.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index bafb2a460f..181b10b91c 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -1,15 +1,13 @@ # -*- cmake -*- -#if (INSTALL_PROPRIETARY) -# set(HEADLESS ON CACHE BOOL "Use headless mesa library.") -#endif (INSTALL_PROPRIETARY) - +include(Variables) include(Prebuilt) -if (LINUX AND NOT STANDALONE) +if (BUILD_HEADLESS) use_prebuilt_binary(mesa) SET(OPENGL_glu_LIBRARY GLU) -endif (LINUX AND NOT STANDALONE) + SET(OPENGL_HEADLESS_LIBRARIES OSMesa16 GLU) +endif (BUILD_HEADLESS) include(FindOpenGL) |