diff options
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r-- | linden/indra/cmake/00-Common.cmake | 9 | ||||
-rw-r--r-- | linden/indra/cmake/Variables.cmake | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 1b5e9d2..746a3bf 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
@@ -5,10 +5,15 @@ | |||
5 | include(Variables) | 5 | include(Variables) |
6 | include(Prebuilt) | 6 | include(Prebuilt) |
7 | 7 | ||
8 | # Download viewer artwork | 8 | # Download viewer artwork even when using standalone |
9 | 9 | ||
10 | if (STANDALONE) | ||
11 | set(STANDALONE OFF) | ||
12 | use_prebuilt_binary(artwork) | ||
13 | set(STANDALONE ON) | ||
14 | else (STANDALONE) | ||
10 | use_prebuilt_binary(artwork) | 15 | use_prebuilt_binary(artwork) |
11 | 16 | endif (STANDALONE) | |
12 | 17 | ||
13 | # Portable compilation flags. | 18 | # Portable compilation flags. |
14 | 19 | ||
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake index 8f33a95..5d4dffe 100644 --- a/linden/indra/cmake/Variables.cmake +++ b/linden/indra/cmake/Variables.cmake | |||
@@ -82,7 +82,7 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.") | |||
82 | set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name") | 82 | set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name") |
83 | set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") | 83 | set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") |
84 | 84 | ||
85 | set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") | 85 | set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.") |
86 | 86 | ||
87 | if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) | 87 | if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) |
88 | set(SERVER ON CACHE BOOL "Build Second Life server software.") | 88 | set(SERVER ON CACHE BOOL "Build Second Life server software.") |