diff options
| author | McCabe Maxsted | 2009-12-01 08:14:11 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2009-12-06 16:33:57 -0600 |
| commit | 18b5636b74d80034867e2e8273706db4dc490b15 (patch) | |
| tree | 18a1eccd424335f0b60ce2e01657ddb8e1386ed3 /linden/indra/cmake/00-Common.cmake | |
| parent | Added Imprudence viewer artwork to install.xml (diff) | |
| download | meta-impy-18b5636b74d80034867e2e8273706db4dc490b15.zip meta-impy-18b5636b74d80034867e2e8273706db4dc490b15.tar.gz meta-impy-18b5636b74d80034867e2e8273706db4dc490b15.tar.bz2 meta-impy-18b5636b74d80034867e2e8273706db4dc490b15.tar.xz | |
Made downloading the artwork work while using the --standalone flag
Diffstat (limited to 'linden/indra/cmake/00-Common.cmake')
| -rw-r--r-- | linden/indra/cmake/00-Common.cmake | 9 |
1 files changed, 7 insertions, 2 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 | ||