5 files changed, 24 insertions, 10 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7a9fefa..3003c69 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,13 @@
 2009-12-01 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Moved the viewer artwork to its own CMake file.
+        
+          new file:   linden/indra/cmake/ViewerArtwork.cmake
+          modified:   linden/indra/cmake/00-Common.cmake
+          modified:   linden/indra/llaudio/CMakeLists.txt
+          modified:   linden/indra/newview/CMakeLists.txt
+          
+          
         * Removed libpng12-0.dll from CopyWinLibs.cmake.
         
           modified:   linden/indra/cmake/CopyWinLibs.cmake
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 @@
 # Compilation options shared by all Second Life components.
 
 include(Variables)
-include(Prebuilt)
 
-# Download viewer artwork even when using standalone
-
-if (STANDALONE)
-  set(STANDALONE OFF)
-    use_prebuilt_binary(artwork)
-  set(STANDALONE ON)
-else (STANDALONE)
-  use_prebuilt_binary(artwork)
-endif (STANDALONE)
 
 # Portable compilation flags.
 
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 @@
+# -*- cmake -*-
+#
+# Download viewer artwork even when using standalone
+
+include(Variables)
+include(Prebuilt)
+
+if (NOT STANDALONE)
+  use_prebuilt_binary(artwork)
+else (NOT STANDALONE)
+  set(STANDALONE OFF)
+    use_prebuilt_binary(artwork)
+  set(STANDALONE ON)
+endif (NOT STANDALONE)
diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt
index 70041e7..0a668f9 100644
--- a/linden/indra/llaudio/CMakeLists.txt
+++ b/linden/indra/llaudio/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 project(llaudio)
 
+# Current starting point for CMake. Seems rather arbitrary - MC
 include(00-Common)
 include(Audio)
 include(OPENAL)
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 26c9b21..cafe004 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -35,6 +35,7 @@ include(GooglePerfTools)
 include(TemplateCheck)
 include(UI)
 include(UnixInstall)
+include(ViewerArtwork)
 include(ViewerMiscLibs)
 
 if (WINDOWS)