diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-30 19:50:05 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-30 19:50:05 -0700 |
| commit | 806d09b1143894ad66cea2c228f467e8c39a8adf (patch) | |
| tree | 512bfa5d5a8fe92ac4616fd9169e1c458b0e8b87 /indra/cmake/LLRender.cmake | |
| parent | b06ec66a5d11628905da256e084d0036f39ba529 (diff) | |
Merge 3.5.1 into Materials
Diffstat (limited to 'indra/cmake/LLRender.cmake')
| -rw-r--r-- | indra/cmake/LLRender.cmake | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake index 8427928151..868922451f 100644 --- a/indra/cmake/LLRender.cmake +++ b/indra/cmake/LLRender.cmake @@ -1,5 +1,6 @@ # -*- cmake -*- +include(Variables) include(FreeType) include(GLH) @@ -8,27 +9,12 @@ set(LLRENDER_INCLUDE_DIRS ${GLH_INCLUDE_DIR} ) -if (SERVER AND LINUX) - set(LLRENDER_LIBRARIES +if (BUILD_HEADLESS) + set(LLRENDER_HEADLESS_LIBRARIES llrenderheadless ) -else (SERVER AND LINUX) +endif (BUILD_HEADLESS) set(LLRENDER_LIBRARIES llrender ) -endif (SERVER AND LINUX) -# mapserver requires certain files to be copied so LL_MESA_HEADLESS can be set -# differently for different object files. -macro (copy_server_sources ) - foreach (PREFIX ${ARGV}) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}_server.cpp - COMMAND ${CMAKE_COMMAND} - ARGS -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${PREFIX}.cpp - ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}_server.cpp - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${PREFIX}.cpp - ) - list(APPEND server_SOURCE_FILES ${PREFIX}_server.cpp) - endforeach (PREFIX ${_copied_SOURCES}) -endmacro (copy_server_sources _copied_SOURCES) |