diff options
author | McCabe Maxsted | 2009-12-01 10:10:27 -0700 |
---|---|---|
committer | Jacek Antonelli | 2009-12-06 16:46:32 -0600 |
commit | c319b23e7ab7f95bad43dbaf15542eb4a97c59a5 (patch) | |
tree | 8c52b9e36f3e0c40816cfcbb4ef8d12e26bac129 /linden/indra/cmake | |
parent | vstool VS2010 support (diff) | |
download | meta-impy-c319b23e7ab7f95bad43dbaf15542eb4a97c59a5.zip meta-impy-c319b23e7ab7f95bad43dbaf15542eb4a97c59a5.tar.gz meta-impy-c319b23e7ab7f95bad43dbaf15542eb4a97c59a5.tar.bz2 meta-impy-c319b23e7ab7f95bad43dbaf15542eb4a97c59a5.tar.xz |
Moved the viewer artwork to its own CMake file
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r-- | linden/indra/cmake/00-Common.cmake | 10 | ||||
-rw-r--r-- | linden/indra/cmake/ViewerArtwork.cmake | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 746a3bf..49fdb5b 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
@@ -3,17 +3,7 @@ | |||
3 | # Compilation options shared by all Second Life components. | 3 | # Compilation options shared by all Second Life components. |
4 | 4 | ||
5 | include(Variables) | 5 | include(Variables) |
6 | include(Prebuilt) | ||
7 | 6 | ||
8 | # Download viewer artwork even when using standalone | ||
9 | |||
10 | if (STANDALONE) | ||
11 | set(STANDALONE OFF) | ||
12 | use_prebuilt_binary(artwork) | ||
13 | set(STANDALONE ON) | ||
14 | else (STANDALONE) | ||
15 | use_prebuilt_binary(artwork) | ||
16 | endif (STANDALONE) | ||
17 | 7 | ||
18 | # Portable compilation flags. | 8 | # Portable compilation flags. |
19 | 9 | ||
diff --git a/linden/indra/cmake/ViewerArtwork.cmake b/linden/indra/cmake/ViewerArtwork.cmake new file mode 100644 index 0000000..f01109a --- /dev/null +++ b/linden/indra/cmake/ViewerArtwork.cmake | |||
@@ -0,0 +1,14 @@ | |||
1 | # -*- cmake -*- | ||
2 | # | ||
3 | # Download viewer artwork even when using standalone | ||
4 | |||
5 | include(Variables) | ||
6 | include(Prebuilt) | ||
7 | |||
8 | if (NOT STANDALONE) | ||
9 | use_prebuilt_binary(artwork) | ||
10 | else (NOT STANDALONE) | ||
11 | set(STANDALONE OFF) | ||
12 | use_prebuilt_binary(artwork) | ||
13 | set(STANDALONE ON) | ||
14 | endif (NOT STANDALONE) | ||