CMake cleanup and organization

2013-03-05 12:24:51 -05:00
parent 28eec629ec
commit 0e3a9b28bd
24 changed files with 134 additions and 450 deletions
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -2,6 +2,9 @@
 #
 # Compilation options shared by all Second Life components.

+if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
+set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
+
 include(Variables)


@@ -309,8 +312,6 @@ else (STANDALONE)
 endif (STANDALONE)

 if(1 EQUAL 1)
-  add_definitions(-DOPENSIM_RULES=1)
-  add_definitions(-DMESH_ENABLED=1)
  add_definitions(-DENABLE_CLASSIC_CLOUDS=1)
  if (NOT "$ENV{SHY_MOD}" STREQUAL "")
    add_definitions(-DSHY_MOD=1)
@@ -331,3 +332,5 @@ MARK_AS_ADVANCED(
    CMAKE_EXE_LINKER_FLAGS_RELEASE
    CMAKE_SHARED_LINKER_FLAGS_RELEASE
    )
+
+endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -15,20 +15,8 @@ else (STANDALONE)

  if (WINDOWS)
    set(BOOST_VERSION 1_45)
-
-    # SNOW-788
-    # 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc
-    # The precompiled boost libs for VC71 use a different suffix to VS80 and VS90
-    # This code should ensure the cmake rules are valid for any VS being used in future as long as the approprate
-    # boost libs are avaiable - RC.
-
-    if (MSVC71)
-      set(BOOST_OPTIM_SUFFIX mt-s)
-      set(BOOST_DEBUG_SUFFIX mt-sgd)
-    else (MSVC71)
-      set(BOOST_OPTIM_SUFFIX mt)
-      set(BOOST_DEBUG_SUFFIX mt-gd)
-    endif (MSVC71)
+    set(BOOST_OPTIM_SUFFIX mt)
+    set(BOOST_DEBUG_SUFFIX mt-gd)

    set(Boost_PROGRAM_OPTIONS_LIBRARY 
          optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -8,33 +8,43 @@ set(cmake_SOURCE_FILES
    CMakeLists.txt

    00-Common.cmake
+    AIStateMachine.cmake
    APR.cmake
    Audio.cmake
+    BasicPluginBase.cmake
    BerkeleyDB.cmake
    Boost.cmake
    BuildVersion.cmake
    CARes.cmake
    CMakeCopyIfDifferent.cmake
    CURL.cmake
+    Colladadom.cmake
+    ConfigurePkgConfig.cmake
+    CopyBackToSource.cmake
    CopyWinLibs.cmake
-    CSharpMacros.cmake
+    Cwdebug.cmake
    DBusGlib.cmake
    DirectX.cmake
    DownloadPrebuilt.cmake.in
    ELFIO.cmake
    EXPAT.cmake
+    ExamplePlugin.cmake
+    FMOD.cmake
+    FMODEX.cmake
    FindAPR.cmake
    FindBerkeleyDB.cmake
    FindCARes.cmake
+    FindColladadom.cmake
    FindELFIO.cmake
+    FindGLOD.cmake
    FindGooglePerfTools.cmake
    FindHunSpell.cmake
    FindJsonCpp.cmake
+    FindLLQtWebkit.cmake
    FindNDOF.cmake
    FindOpenJPEG.cmake
+    FindTut.cmake
    FindXmlRpcEpi.cmake
-    FMOD.cmake
-    FMODEX.cmake
    FreeType.cmake
    GLOD.cmake
    GStreamer010Plugin.cmake
@@ -53,7 +63,6 @@ set(cmake_SOURCE_FILES
    LLImage.cmake
    LLImageJ2COJ.cmake
    LLInventory.cmake
-    LLKDU.cmake
    LLMath.cmake
    LLMessage.cmake
    LLPhysicsExtensions.cmake
@@ -65,7 +74,7 @@ set(cmake_SOURCE_FILES
    LLVFS.cmake
    LLWindow.cmake
    LLXML.cmake
-#    LScript.cmake
+    LScript.cmake
    Linking.cmake
    MediaPluginBase.cmake
    NDOF.cmake
@@ -74,17 +83,20 @@ set(cmake_SOURCE_FILES
    OpenJPEG.cmake
    OpenSSL.cmake
    PNG.cmake
+    PluginAPI.cmake
    Prebuilt.cmake
    PulseAudio.cmake
    Python.cmake
    Qt4.cmake
    QuickTimePlugin.cmake
    RunBuildTest.cmake
+    StateMachine.cmake
    TemplateCheck.cmake
    Tut.cmake
    UI.cmake
    UnixInstall.cmake
    Variables.cmake
+    ViewerMiscLibs.cmake
    WebKitLibPlugin.cmake
    XmlRpcEpi.cmake
    ZLIB.cmake
--- a/indra/cmake/CSharpMacros.cmake
+++ b/indra/cmake/CSharpMacros.cmake
@@ -1,142 +0,0 @@
-# - This is a support module for easy Mono/C# handling with CMake
-# It defines the following macros:
-#
-# ADD_CS_LIBRARY (<target> <source>)
-# ADD_CS_EXECUTABLE (<target> <source>)
-# INSTALL_GAC (<target>)
-#
-# Note that the order of the arguments is important.
-#
-# You can optionally set the variable CS_FLAGS to tell the macros whether
-# to pass additional flags to the compiler. This is particularly useful to
-# set assembly references, unsafe code, etc... These flags are always reset
-# after the target was added so you don't have to care about that.
-#
-# copyright (c) 2007 Arno Rehn arno@arnorehn.de
-#
-# Redistribution and use is allowed according to the terms of the GPL license.
-
-
-# ----- support macros -----
-MACRO(GET_CS_LIBRARY_TARGET_DIR)
-        IF (NOT LIBRARY_OUTPUT_PATH)
-                SET(CS_LIBRARY_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR})
-        ELSE (NOT LIBRARY_OUTPUT_PATH)
-                SET(CS_LIBRARY_TARGET_DIR ${LIBRARY_OUTPUT_PATH})
-        ENDIF (NOT LIBRARY_OUTPUT_PATH)
-ENDMACRO(GET_CS_LIBRARY_TARGET_DIR)
-
-MACRO(GET_CS_EXECUTABLE_TARGET_DIR)
-        IF (NOT EXECUTABLE_OUTPUT_PATH)
-                SET(CS_EXECUTABLE_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR})
-        ELSE (NOT EXECUTABLE_OUTPUT_PATH)
-                SET(CS_EXECUTABLE_TARGET_DIR ${EXECUTABLE_OUTPUT_PATH})
-        ENDIF (NOT EXECUTABLE_OUTPUT_PATH)
-ENDMACRO(GET_CS_EXECUTABLE_TARGET_DIR)
-
-MACRO(MAKE_PROPER_FILE_LIST)
-        FOREACH(file ${ARGN})
-                # first assume it's a relative path
-                FILE(GLOB globbed ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-                IF(globbed)
-                        FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${file} native)
-                ELSE(globbed)
-                        FILE(TO_NATIVE_PATH ${file} native)
-                ENDIF(globbed)
-                SET(proper_file_list ${proper_file_list} ${native})
-                SET(native "")
-        ENDFOREACH(file)
-ENDMACRO(MAKE_PROPER_FILE_LIST)
-# ----- end support macros -----
-
-MACRO(ADD_CS_LIBRARY target)
-        GET_CS_LIBRARY_TARGET_DIR()
-        
-        SET(target_DLL "${CS_LIBRARY_TARGET_DIR}/${target}.dll")
-        MAKE_PROPER_FILE_LIST(${ARGN})
-        FILE(RELATIVE_PATH relative_path ${CMAKE_BINARY_DIR} ${target_DLL})
-        
-        SET(target_KEY "${CMAKE_CURRENT_SOURCE_DIR}/${target}.key")
-        SET(target_CS_FLAGS "${CS_FLAGS}")
-        IF(${target}_CS_FLAGS)
-                LIST(APPEND target_CS_FLAGS ${${target}_CS_FLAGS})
-        ENDIF(${target}_CS_FLAGS)
-        IF(EXISTS ${target_KEY})
-                LIST(APPEND target_CS_FLAGS -keyfile:${target_KEY})
-        ENDIF(EXISTS ${target_KEY})
-
-        FOREACH(ref ${${target}_REFS})
-                SET(ref_DLL ${CMAKE_CURRENT_BINARY_DIR}/${ref}.dll)
-                IF(EXISTS ${ref_DLL})
-                        LIST(APPEND target_CS_FLAGS -r:${ref_DLL})
-                ELSE(EXISTS ${ref_DLL})
-                        LIST(APPEND target_CS_FLAGS -r:${ref})
-                ENDIF(EXISTS ${ref_DLL})
-        ENDFOREACH(ref ${${target}_REFS})
-
-        ADD_CUSTOM_COMMAND (OUTPUT ${target_DLL}
-                COMMAND ${MCS_EXECUTABLE} ${target_CS_FLAGS} -out:${target_DLL} -target:library ${proper_file_list}
-                MAIN_DEPENDENCY ${proper_file_list}
-                DEPENDS ${ARGN}
-                COMMENT "Building ${relative_path}")
-        ADD_CUSTOM_TARGET (${target} ALL DEPENDS ${target_DLL})
-
-        FOREACH(ref ${${target}_REFS})
-                GET_TARGET_PROPERTY(is_target ${ref} TYPE)
-                IF(is_target)
-                        ADD_DEPENDENCIES(${target} ${ref})
-                ENDIF(is_target)
-        ENDFOREACH(ref ${${target}_REFS})
-
-        SET(relative_path "")
-        SET(proper_file_list "")
-ENDMACRO(ADD_CS_LIBRARY)
-
-MACRO(ADD_CS_EXECUTABLE target)
-        GET_CS_EXECUTABLE_TARGET_DIR()
-        
-        # Seems like cmake doesn't like the ".exe" ending for custom commands.
-        # If we call it ${target}.exe, 'make' will later complain about a missing rule.
-        # Create a fake target instead.
-        SET(target_EXE "${CS_EXECUTABLE_TARGET_DIR}/${target}.exe")
-        SET(target_TOUCH "${CS_EXECUTABLE_TARGET_DIR}/${target}.exe-built")
-        GET_DIRECTORY_PROPERTY(clean ADDITIONAL_MAKE_CLEAN_FILES)
-        LIST(APPEND clean ${target}.exe)
-        SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${clean}")
-        MAKE_PROPER_FILE_LIST(${ARGN})
-        FILE(RELATIVE_PATH relative_path ${CMAKE_BINARY_DIR} ${target_EXE})
-        SET(target_CS_FLAGS "${CS_FLAGS}")
-        
-        FOREACH(ref ${${target}_REFS})
-                SET(ref_DLL ${CMAKE_CURRENT_SOURCE_DIR}/${ref}.dll)
-                IF(EXISTS ${ref_DLL})
-                        LIST(APPEND target_CS_FLAGS -r:${ref_DLL})
-                ELSE(EXISTS ${ref_DLL})
-                        LIST(APPEND target_CS_FLAGS -r:${ref})
-                ENDIF(EXISTS ${ref_DLL})
-        ENDFOREACH(ref ${${target}_REFS})
-
-        ADD_CUSTOM_COMMAND (OUTPUT "${target_TOUCH}"
-                COMMAND ${MCS_EXECUTABLE} ${target_CS_FLAGS} -out:${target_EXE} ${proper_file_list}
-                COMMAND ${CMAKE_COMMAND} -E touch ${target_TOUCH}
-                MAIN_DEPENDENCY ${ARGN}
-                DEPENDS ${ARGN}
-                COMMENT "Building ${relative_path}")
-        ADD_CUSTOM_TARGET ("${target}" ALL DEPENDS "${target_TOUCH}")
-
-        FOREACH(ref ${${target}_REFS})
-                GET_TARGET_PROPERTY(is_target ${ref} TYPE)
-                IF(is_target)
-                        ADD_DEPENDENCIES(${target} ${ref})
-                ENDIF(is_target)
-        ENDFOREACH(ref ${${target}_REFS})
-
-        SET(relative_path "")
-        SET(proper_file_list "")
-ENDMACRO(ADD_CS_EXECUTABLE)
-
-MACRO(INSTALL_GAC target)
-        GET_CS_LIBRARY_TARGET_DIR()
-        
-        INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${GACUTIL_EXECUTABLE} -i ${CS_LIBRARY_TARGET_DIR}/${target}.dll -package 2.0)")
-ENDMACRO(INSTALL_GAC target)
--- a/indra/cmake/CopyWinLibs.cmake
+++ b/indra/cmake/CopyWinLibs.cmake
@@ -284,53 +284,6 @@ copy_if_different(
    )
 set(all_targets ${all_targets} ${out_targets})

-set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
-if(EXISTS ${internal_llkdu_path})
-    set(internal_llkdu_src "${CMAKE_BINARY_DIR}/llkdu/${CMAKE_CFG_INTDIR}/llkdu.dll")
-    set(llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${internal_llkdu_src} ${llkdu_dst}
-        DEPENDS ${internal_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
-        )
-    set(all_targets ${all_targets} ${llkdu_dst})
-else(EXISTS ${internal_llkdu_path})
-    if (EXISTS "${debug_src_dir}/llkdu.dll")
-        set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
-        set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll")
-        ADD_CUSTOM_COMMAND(
-            OUTPUT  ${debug_llkdu_dst}
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst}
-            DEPENDS ${debug_llkdu_src}
-            COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug"
-            )
-        set(all_targets ${all_targets} ${debug_llkdu_dst})
-    endif (EXISTS "${debug_src_dir}/llkdu.dll")
-
-    if (EXISTS "${release_src_dir}/llkdu.dll")
-        set(release_llkdu_src "${release_src_dir}/llkdu.dll")
-        set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll")
-        ADD_CUSTOM_COMMAND(
-            OUTPUT  ${release_llkdu_dst}
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst}
-            DEPENDS ${release_llkdu_src}
-            COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release"
-            )
-        set(all_targets ${all_targets} ${release_llkdu_dst})
-
-        set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll")
-        ADD_CUSTOM_COMMAND(
-            OUTPUT  ${relwithdebinfo_llkdu_dst}
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst}
-            DEPENDS ${release_llkdu_src}
-            COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-            )
-        set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst})
-    endif (EXISTS "${release_src_dir}/llkdu.dll")
-   
-endif (EXISTS ${internal_llkdu_path})
-
 # Copy MS C runtime dlls, required for packaging.
 # *TODO - Adapt this to support VC9
 if (MSVC80)
@@ -439,6 +392,3 @@ add_custom_target(copy_win_libs ALL
  )
 add_dependencies(copy_win_libs prepare)

-if(EXISTS ${internal_llkdu_path})
-    add_dependencies(copy_win_libs llkdu)
-endif(EXISTS ${internal_llkdu_path})
--- a/indra/cmake/FindMT.cmake
+++ b/indra/cmake/FindMT.cmake
@@ -1,17 +0,0 @@
-#Find the windows manifest tool.
-if (MSVC80)
-  FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt
-                   PATHS
-                   "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"
-                   "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
-                   "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
-  IF(HAVE_MANIFEST_TOOL)
-      MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.")
-  ELSE(HAVE_MANIFEST_TOOL)
-      MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.")
-  ENDIF(HAVE_MANIFEST_TOOL)
-
-  STRING(REPLACE "/MANIFEST " "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
-      ${CMAKE_EXE_LINKER_FLAGS})
-
-endif (MSVC80)
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -1,18 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
-  use_prebuilt_binary(kdu)
-  if (WINDOWS)
-    set(KDU_LIBRARY debug kdu_cored optimized kdu_core)
-  else (WINDOWS)
-    set(KDU_LIBRARY kdu)
-  endif (WINDOWS)
-
-  set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-
-  set(LLKDU_LIBRARY llkdu)
-  set(LLKDU_STATIC_LIBRARY llkdu_static)
-  set(LLKDU_LIBRARIES ${LLKDU_LIBRARY})
-  set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY})
-endif (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
@@ -3,8 +3,5 @@ include(Prebuilt)

 if (NOT (STANDALONE OR DARWIN))
  use_prebuilt_binary(glext)
-  # possible glh_linear should have its own .cmake file instead
-  #use_prebuilt_binary(glh_linear)
-  # actually... not any longer, it's now in git -SG
  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-endif ()
+endif (NOT (STANDALONE OR DARWIN))
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -12,6 +12,9 @@

 # Relative and absolute paths to subtrees.

+if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
+set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
+
 if(NOT DEFINED COMMON_CMAKE_DIR)
    set(COMMON_CMAKE_DIR "${CMAKE_SOURCE_DIR}/cmake")
 endif(NOT DEFINED COMMON_CMAKE_DIR)
@@ -140,3 +143,5 @@ set(VIEWER_BRANDING_NAME_CAMELCASE "Singularity")
 set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")

 source_group("CMake Rules" FILES CMakeLists.txt)
+
+endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -81,7 +81,6 @@ class PlatformSetup(object):
    distcc = True
    cmake_opts = []
    word_size = 32
-    opensim_rules = 'OFF' #whether or not to use rules fit for opensim
    using_express = False

    def __init__(self):
@@ -125,7 +124,6 @@ class PlatformSetup(object):
            standalone=self.standalone,
            unattended=self.unattended,
            word_size=self.word_size,
-            opensim_rules=self.opensim_rules,
            type=self.build_type.upper(),
            )
        #if simple:
@@ -134,7 +132,6 @@ class PlatformSetup(object):
                '-DSTANDALONE:BOOL=%(standalone)s '
                '-DUNATTENDED:BOOL=%(unattended)s '
                '-DWORD_SIZE:STRING=%(word_size)s '
-                '-DOPENSIM_RULES:BOOL=%(opensim_rules)s '
                '-G %(generator)r %(opts)s %(dir)r' % args)

    def run_cmake(self, args=[]):
@@ -296,7 +293,6 @@ class LinuxSetup(UnixSetup):
            type=self.build_type.upper(),
            project_name=self.project_name,
            word_size=self.word_size,
-            opensim_rules=self.opensim_rules,
            )
        if not self.is_internal_tree():
            args.update({'cxx':'g++', 'server':'OFF', 'viewer':'ON'})
@@ -323,7 +319,6 @@ class LinuxSetup(UnixSetup):
                '-DVIEWER:BOOL=%(viewer)s -DSTANDALONE:BOOL=%(standalone)s '
                '-DUNATTENDED:BOOL=%(unattended)s '
                '-DWORD_SIZE:STRING=%(word_size)s '
-                '-DOPENSIM_RULES:BOOL=%(opensim_rules)s '
                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
                '%(opts)s %(dir)r')
               % args)
@@ -437,7 +432,6 @@ class DarwinSetup(UnixSetup):
            unattended=self.unattended,
            project_name=self.project_name,
            universal=self.universal,
-            opensim_rules=self.opensim_rules,
            type=self.build_type.upper(),
            )
        if self.universal == 'ON':
@@ -449,7 +443,6 @@ class DarwinSetup(UnixSetup):
                '-DSTANDALONE:BOOL=%(standalone)s '
                '-DUNATTENDED:BOOL=%(unattended)s '
                '-DWORD_SIZE:STRING=%(word_size)s '
-                '-DOPENSIM_RULES:BOOL=%(opensim_rules)s '
                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
                '%(universal)s '
                '%(opts)s %(dir)r' % args)
@@ -535,7 +528,6 @@ class WindowsSetup(PlatformSetup):
            unattended=self.unattended,
            project_name=self.project_name,
            word_size=self.word_size,
-            opensim_rules=self.opensim_rules,
            )
        #if simple:
        #    return 'cmake %(opts)s "%(dir)s"' % args
@@ -543,7 +535,6 @@ class WindowsSetup(PlatformSetup):
                '-DSTANDALONE:BOOL=%(standalone)s '
                '-DUNATTENDED:BOOL=%(unattended)s '
                '-DWORD_SIZE:STRING=%(word_size)s '
-                '-DOPENSIM_RULES:BOOL=%(opensim_rules)s '
                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
                '%(opts)s "%(dir)s"' % args)

@@ -719,7 +710,6 @@ class CygwinSetup(WindowsSetup):
            unattended=self.unattended,
            project_name=self.project_name,
            word_size=self.word_size,
-            opensim_rules=self.opensim_rules,
            )
        #if simple:
        #    return 'cmake %(opts)s "%(dir)s"' % args
@@ -727,7 +717,6 @@ class CygwinSetup(WindowsSetup):
                '-DUNATTENDED:BOOl=%(unattended)s '
                '-DSTANDALONE:BOOL=%(standalone)s '
                '-DWORD_SIZE:STRING=%(word_size)s '
-                '-DOPENSIM_RULES:BOOL=%(opensim_rules)s '
                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
                '%(opts)s "%(dir)s"' % args)

@@ -766,21 +755,15 @@ Commands:

 Command-options for "configure":
  We use cmake variables to change the build configuration.
-  -DSERVER:BOOL=OFF          Don't configure simulator/dataserver/etc
-  -DVIEWER:BOOL=OFF          Don't configure the viewer
  -DPACKAGE:BOOL=ON          Create "package" target to make installers
  -DLOCALIZESETUP:BOOL=ON    Create one win_setup target per supported language
  -DLL_TESTS:BOOL=OFF        Don't generate unit test projects
  -DEXAMPLEPLUGIN:BOOL=OFF   Don't generate example plugin project
  -DDISABLE_TCMALLOC:BOOL=ON Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc)
-  -DVISTA_ICON:BOOL=ON       Allow pre-2008 VS to use vista-optimized resource file. (Requires updated rcdll.dll!)

 Examples:
-  Set up a viewer-only project for your system:
-    develop.py configure -DSERVER:BOOL=OFF
-  
-  Set up a Visual Studio 2005 project with "package" target:
-    develop.py -G vc80 configure -DPACKAGE:BOOL=ON
+  Set up a Visual Studio 2010 project with "package" target:
+    develop.py -G vc100 configure -DPACKAGE:BOOL=ON
 '''

 def main(arguments):
--- a/indra/libopenjpeg/CMakeLists.txt
+++ b/indra/libopenjpeg/CMakeLists.txt
@@ -14,8 +14,8 @@ set(OPENJPEG_VERSION

 set(openjpeg_SOURCE_FILES
    bio.c
-    cio.c
    cidx_manager.c
+    cio.c
    dwt.c
    event.c
    image.c
@@ -26,8 +26,8 @@ set(openjpeg_SOURCE_FILES
    mct.c
    mqc.c
    openjpeg.c
-    pi.c
    phix_manager.c
+    pi.c
    ppix_manager.c
    raw.c
    t1.c
@@ -40,8 +40,8 @@ set(openjpeg_SOURCE_FILES

 set(openjpeg_HEADER_FILES
    bio.h
-    cio.h
    cidx_manager.h
+    cio.h
    dwt.h
    event.h
    fix.h
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -40,9 +40,9 @@ include_directories(
    )

 set(llaudio_SOURCE_FILES
+    llaudiodecodemgr.cpp
    llaudioengine.cpp
    lllistener.cpp
-    llaudiodecodemgr.cpp
    llvorbisdecode.cpp
    llvorbisencode.cpp
    )
@@ -50,9 +50,9 @@ set(llaudio_SOURCE_FILES
 set(llaudio_HEADER_FILES
    CMakeLists.txt

+    llaudiodecodemgr.h
    llaudioengine.h
    lllistener.h
-    llaudiodecodemgr.h
    llvorbisdecode.h
    llvorbisencode.h
    llwindgen.h
--- a/indra/llcharacter/CMakeLists.txt
+++ b/indra/llcharacter/CMakeLists.txt
@@ -32,8 +32,8 @@ set(llcharacter_SOURCE_FILES
    llkeyframemotionparam.cpp
    llkeyframestandmotion.cpp
    llkeyframewalkmotion.cpp
-    llmotioncontroller.cpp
    llmotion.cpp
+    llmotioncontroller.cpp
    llmultigesture.cpp
    llpose.cpp
    llstatemachine.cpp
@@ -45,8 +45,8 @@ set(llcharacter_HEADER_FILES
    CMakeLists.txt

    llanimationstates.h
-    llbvhloader.h
    llbvhconsts.h
+    llbvhloader.h
    llcharacter.h
    lleditingmotion.h
    llgesture.h
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -19,6 +19,7 @@ set(llcommon_SOURCE_FILES
    aithreadid.cpp
    imageids.cpp
    indra_constants.cpp
+    ll_template_cast.h
    llallocator.cpp
    llallocator_heap_profile.cpp
    llapp.cpp
@@ -54,9 +55,9 @@ set(llcommon_SOURCE_FILES
    llformat.cpp
    llframetimer.cpp
    llheartbeat.cpp
+    llindraconfigfile.cpp
    llinitparam.cpp
    llinstancetracker.cpp
-    llindraconfigfile.cpp
    llliveappconfig.cpp
    lllivefile.cpp
    lllog.cpp
@@ -66,9 +67,9 @@ set(llcommon_SOURCE_FILES
    llmetrics.cpp
    llmortician.cpp
    lloptioninterface.cpp
-    llptrto.cpp 
    llprocesslauncher.cpp
    llprocessor.cpp
+    llptrto.cpp 
    llqueuedthread.cpp
    llrand.cpp
    llrefcount.cpp
@@ -80,8 +81,8 @@ set(llcommon_SOURCE_FILES
    llsdutil.cpp
    llsecondlifeurls.cpp
    llsingleton.cpp
-    llstat.cpp
    llstacktrace.cpp
+    llstat.cpp
    llstreamtools.cpp
    llstring.cpp
    llstringtable.cpp
@@ -92,7 +93,6 @@ set(llcommon_SOURCE_FILES
    lluri.cpp
    lluuid.cpp
    llworkerthread.cpp
-    ll_template_cast.h
    metaclass.cpp
    metaproperty.cpp
    reflective.cpp
@@ -115,10 +115,9 @@ set(llcommon_HEADER_FILES
    linden_common.h
    linked_lists.h
    llaccountingcost.h
+    llagentconstants.h
    llallocator.h
    llallocator_heap_profile.h
-    llagentconstants.h
-    llavatarname.h
    llapp.h
    llapr.h
    llaprpool.h
@@ -126,6 +125,7 @@ set(llcommon_HEADER_FILES
    llassoclist.h
    llatomic.h
    llavatarconstants.h
+    llavatarname.h
    llbase32.h
    llbase64.h
    llboost.h
@@ -141,8 +141,8 @@ set(llcommon_HEADER_FILES
    lldarrayptr.h
    lldate.h
    lldefs.h
-    lldependencies.h
    lldeleteutils.h
+    lldependencies.h
    lldepthstack.h
    lldictionary.h
    lldlinked.h
@@ -157,11 +157,11 @@ set(llcommon_HEADER_FILES
    lleventapi.h
    lleventcoro.h
    lleventdispatcher.h
+    lleventemitter.h
    lleventfilter.h
    llevents.h
-    lleventemitter.h
-    llextendedstatus.h
    lleventtimer.h
+    llextendedstatus.h
    llfasttimer.h
    llfasttimer_class.h
    llfile.h
@@ -175,9 +175,9 @@ set(llcommon_HEADER_FILES
    llheartbeat.h
    llhttpstatuscodes.h
    llindexedqueue.h
+    llindraconfigfile.h
    llinitparam.h
    llinstancetracker.h
-    llindraconfigfile.h
    llkeythrottle.h
    lllinkedqueue.h
    llliveappconfig.h
@@ -204,8 +204,8 @@ set(llcommon_HEADER_FILES
    llqueuedthread.h
    llrand.h
    llrefcount.h
-    llrun.h
    llrefcount.h
+    llrun.h
    llsafehandle.h
    llsd.h
    llsdserialize.h
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -22,8 +22,8 @@ include_directories(
    )

 set(llimage_SOURCE_FILES
-    llimagebmp.cpp
    llimage.cpp
+    llimagebmp.cpp
    llimagedxt.cpp
    llimagej2c.cpp
    llimagejpeg.cpp
@@ -35,6 +35,7 @@ set(llimage_SOURCE_FILES

 set(llimage_HEADER_FILES
    CMakeLists.txt
+
    llimage.h
    llimagebmp.h
    llimagedxt.h
--- a/indra/llmath/CMakeLists.txt
+++ b/indra/llmath/CMakeLists.txt
@@ -21,12 +21,12 @@ set(llmath_SOURCE_FILES
    llperlin.cpp
    llquaternion.cpp
    llrect.cpp
+    llsdutil_math.cpp
    llsphere.cpp
    llvector4a.cpp
    llvolume.cpp
    llvolumemgr.cpp
    llvolumeoctree.cpp
-    llsdutil_math.cpp
    m3math.cpp
    m4math.cpp
    raytrace.cpp
@@ -66,6 +66,7 @@ set(llmath_HEADER_FILES
    llquaternion2.h
    llquaternion2.inl
    llrect.h
+    llsdutil_math.h
    llsimdmath.h
    llsimdtypes.h
    llsimdtypes.inl
@@ -77,7 +78,6 @@ set(llmath_HEADER_FILES
    llvolume.h
    llvolumemgr.h
    llvolumeoctree.h
-    llsdutil_math.h
    m3math.h
    m4math.h
    raytrace.h
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -30,7 +30,6 @@ set(llmessage_SOURCE_FILES
    aihttptimeout.cpp
    aihttptimeoutpolicy.cpp
    debug_libcurl.cpp
-    llhttpclient.cpp
    llares.cpp
    llareslistener.cpp
    llassetstorage.cpp
@@ -46,6 +45,7 @@ set(llmessage_SOURCE_FILES
    lldispatcher.cpp
    llfiltersd2xmlrpc.cpp
    llhost.cpp
+    llhttpclient.cpp
    llhttpnode.cpp
    llhttpsender.cpp
    llinstantmessage.cpp
@@ -91,9 +91,9 @@ set(llmessage_SOURCE_FILES
    lluseroperation.cpp
    llxfer.cpp
    llxfer_file.cpp
-    llxfermanager.cpp
    llxfer_mem.cpp
    llxfer_vfile.cpp
+    llxfermanager.cpp
    llxorcipher.cpp
    machine.cpp
    message.cpp
@@ -111,8 +111,8 @@ set(llmessage_HEADER_FILES

    aicurl.h
    aicurleasyrequeststatemachine.h
-    aicurlprivate.h
    aicurlperhost.h
+    aicurlprivate.h
    aicurlthread.h
    aihttpheaders.h
    aihttptimeout.h
@@ -166,8 +166,8 @@ set(llmessage_HEADER_FILES
    llpacketbuffer.h
    llpacketring.h
    llpartdata.h
-    llpumpio.h
    llproxy.h
+    llpumpio.h
    llqueryflags.h
    llregionflags.h
    llregionhandle.h
@@ -193,10 +193,10 @@ set(llmessage_HEADER_FILES
    lluseroperation.h
    llvehicleparams.h
    llxfer.h
-    llxfermanager.h
    llxfer_file.h
    llxfer_mem.h
    llxfer_vfile.h
+    llxfermanager.h
    llxorcipher.h
    machine.h
    mean_collision_data.h
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -44,8 +44,8 @@ set(llprimitive_HEADER_FILES
    llprimtexturelist.h
    lltextureanim.h
    lltextureentry.h
-    lltreeparams.h
    lltree_common.h
+    lltreeparams.h
    llvolumemessage.h
    llvolumexml.h
    material_codes.h
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -26,8 +26,8 @@ include_directories(
 set(llrender_SOURCE_FILES
    llcubemap.cpp
    llfont.cpp
-    llfontgl.cpp
    llfontbitmapcache.cpp
+    llfontgl.cpp
    llfontregistry.cpp
    llgl.cpp
    llgldbg.cpp
@@ -49,9 +49,9 @@ set(llrender_HEADER_FILES
    CMakeLists.txt

    llcubemap.h
-    llfontgl.h
    llfont.h
    llfontbitmapcache.h
+    llfontgl.h
    llfontregistry.h
    llgl.h
    llgldbg.h
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -72,9 +72,9 @@ set(llui_SOURCE_FILES
    lluictrlfactory.cpp
    lluistring.cpp
    llundo.cpp
+    llview.cpp
    llviewborder.cpp
    llviewmodel.cpp
-    llview.cpp
    llviewquery.cpp
    )
    
@@ -103,8 +103,8 @@ set(llui_HEADER_FILES
    llmenugl.h
    llmodaldialog.h
    llmultifloater.h 
-    llmultisliderctrl.h
    llmultislider.h
+    llmultisliderctrl.h
    llnotificationptr.h
    llnotifications.h
    llnotificationsutil.h
@@ -120,8 +120,8 @@ set(llui_HEADER_FILES
    llscrollcontainer.h
    llscrollingpanellist.h
    llscrolllistctrl.h
-    llsliderctrl.h
    llslider.h
+    llsliderctrl.h
    llspinctrl.h
    llstyle.h
    lltabcontainer.h
@@ -129,18 +129,18 @@ set(llui_HEADER_FILES
    lltexteditor.h
    lltextparser.h
    lltrans.h
-    lluiconstants.h
-    lluictrlfactory.h
-    lluictrl.h
-    lluifwd.h
    llui.h
    lluicolor.h
+    lluiconstants.h
+    lluictrl.h
+    lluictrlfactory.h
+    lluifwd.h
    lluistring.h
    lluixmltags.h
    llundo.h
+    llview.h
    llviewborder.h
    llviewmodel.h
-    llview.h
    llviewquery.h
    )

--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -35,9 +35,9 @@ include_directories(
 set(llwindow_SOURCE_FILES
    llkeyboard.cpp
    llkeyboardheadless.cpp
-    llwindowheadless.cpp
-    llwindowcallbacks.cpp
    llwindow.cpp
+    llwindowcallbacks.cpp
+    llwindowheadless.cpp
    )

 set(llwindow_HEADER_FILES
@@ -45,8 +45,8 @@ set(llwindow_HEADER_FILES

    llkeyboard.h
    llkeyboardheadless.h
-    llwindowheadless.h
    llwindowcallbacks.h
+    llwindowheadless.h
    )

 set(viewer_SOURCE_FILES
@@ -54,9 +54,9 @@ set(viewer_SOURCE_FILES
    )

 set(viewer_HEADER_FILES
-    llwindow.h
-    llpreeditor.h
    llmousehandler.h
+    llpreeditor.h
+    llwindow.h
    )

 # Libraries on which this library depends, needed for Linux builds
@@ -111,16 +111,16 @@ endif (DARWIN)

 if (WINDOWS)
  list(APPEND llwindow_SOURCE_FILES
-       llwindowwin32.cpp
+       lldragdropwin32.cpp
       lldxhardware.cpp
       llkeyboardwin32.cpp
-       lldragdropwin32.cpp
+       llwindowwin32.cpp
       )
  list(APPEND llwindow_HEADER_FILES
-       llwindowwin32.h
+       lldragdropwin32.h
       lldxhardware.h
       llkeyboardwin32.h
-       lldragdropwin32.h
+       llwindowwin32.h
       )
  list(APPEND llwindow_LINK_LIBRARIES
       comdlg32     # Common Dialogs for ChooseColor
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -42,10 +42,8 @@ include(GooglePerfTools)
 include(StateMachine)
 include(TemplateCheck)
 include(UI)
-include(LLKDU)
 include(ViewerMiscLibs)
 include(GLOD)
-include(ViewerArtwork.cmake)
 include(LLAppearance)

 if (WINDOWS)
@@ -81,6 +79,7 @@ include_directories(
    )

 set(viewer_SOURCE_FILES
+    NACLantispam.cpp
    aoremotectrl.cpp
    ascentfloatercontactgroups.cpp
    ascentkeyword.cpp
@@ -344,8 +343,8 @@ set(viewer_SOURCE_FILES
    llpaneldirland.cpp
    llpaneldirpeople.cpp
    llpaneldirplaces.cpp
-    llpaneldisplay.cpp
    llpaneldirpopular.cpp
+    llpaneldisplay.cpp
    llpaneleditwearable.cpp
    llpanelevent.cpp
    llpanelface.cpp
@@ -548,11 +547,10 @@ set(viewer_SOURCE_FILES
    llworld.cpp
    llworldmap.cpp
    llworldmapmessage.cpp
-    llworldmipmap.cpp
    llworldmapview.cpp
+    llworldmipmap.cpp
    llxmlrpcresponder.cpp
    m7wlinterface.cpp
-    NACLantispam.cpp
    noise.cpp
    pipeline.cpp
    qtoolalign.cpp
@@ -580,6 +578,8 @@ set(VIEWER_BINARY_NAME "secondlife-bin" CACHE STRING
 set(viewer_HEADER_FILES
    CMakeLists.txt
    ViewerInstall.cmake
+
+    NACLantispam.h
    aoremotectrl.h
    ascentfloatercontactgroups.h
    ascentkeyword.h
@@ -697,9 +697,9 @@ set(viewer_HEADER_FILES
    llfloaterdisplayname.h
    llfloatereditui.h
    llfloaterenvsettings.h
+    llfloaterevent.h
    llfloaterexploreanimations.h
    llfloaterexploresounds.h
-    llfloaterevent.h
    llfloaterfeed.h
    llfloaterfonttest.h
    llfloaterfriends.h
@@ -816,8 +816,8 @@ set(viewer_HEADER_FILES
    llmarketplacenotifications.h
    llmediactrl.h
    llmediaremotectrl.h
-    llmenuoptionpathfindingrebakenavmesh.h
    llmenucommands.h
+    llmenuoptionpathfindingrebakenavmesh.h
    llmeshrepository.h
    llmimetypes.h
    llmorphview.h
@@ -1055,12 +1055,11 @@ set(viewer_HEADER_FILES
    llworld.h
    llworldmap.h
    llworldmapmessage.h
-    llworldmipmap.h
    llworldmapview.h
+    llworldmipmap.h
    llxmlrpcresponder.h
    m7wlinterface.h
    macmain.h
-    NACLantispam.h
    noise.h
    pipeline.h
    qtoolalign.h
@@ -1080,9 +1079,9 @@ set(viewer_HEADER_FILES
    shcommandhandler.h
    shfloatermediaticker.h
    slfloatermediafilter.h
+    wlfPanel_AdvSettings.h
    VertexCache.h
    VorbisFramework.h
-    wlfPanel_AdvSettings.h
    )

 source_group("CMake Rules" FILES ViewerInstall.cmake)
@@ -1168,42 +1167,42 @@ if (WINDOWS)
    # viewerRes.rc is the only buildable file, but
    # the rest are all dependencies of it.
    set(viewer_RESOURCE_FILES
-        ${ARTWORK_DIR}/res/arrow.cur
-        ${ARTWORK_DIR}/res/arrowcop.cur
-        ${ARTWORK_DIR}/res/arrowcopmulti.cur
-        ${ARTWORK_DIR}/res/arrowdrag.cur
-        ${ARTWORK_DIR}/res/circleandline.cur
-        ${ARTWORK_DIR}/res/icon1.ico
-        ${ARTWORK_DIR}/res/llarrow.cur
-        ${ARTWORK_DIR}/res/llarrowdrag.cur
-        ${ARTWORK_DIR}/res/llarrowdragmulti.cur
-        ${ARTWORK_DIR}/res/llarrowlocked.cur
-        ${ARTWORK_DIR}/res/llgrablocked.cur
-        ${ARTWORK_DIR}/res/llno.cur
-        ${ARTWORK_DIR}/res/llnolocked.cur
-        ${ARTWORK_DIR}/res/lltoolcamera.cur
-        ${ARTWORK_DIR}/res/lltoolcreate.cur
-        ${ARTWORK_DIR}/res/lltoolfocus.cur
-        ${ARTWORK_DIR}/res/lltoolgrab.cur
-        ${ARTWORK_DIR}/res/lltoolland.cur
-        ${ARTWORK_DIR}/res/lltoolpan.cur
-        ${ARTWORK_DIR}/res/lltoolpipette.cur
-        ${ARTWORK_DIR}/res/lltoolrotate.cur
-        ${ARTWORK_DIR}/res/lltoolscale.cur
-        ${ARTWORK_DIR}/res/lltooltranslate.cur
-        ${ARTWORK_DIR}/res/lltoolzoomin.cur
-        ${ARTWORK_DIR}/res/lltoolzoomout.cur
-        ${ARTWORK_DIR}/res/snowglobe_icon.BMP
-        ${ARTWORK_DIR}/res/snowglobe_icon.ico
-        ${ARTWORK_DIR}/res/resource.h
-        ${ARTWORK_DIR}/res/toolpickobject.cur
-        ${ARTWORK_DIR}/res/toolpickobject2.cur
-        ${ARTWORK_DIR}/res/toolpickobject3.cur
-        ${ARTWORK_DIR}/res/toolpipette.cur
-        ${ARTWORK_DIR}/res/toolbuy.cur
-        ${ARTWORK_DIR}/res/toolopen.cur
-        ${ARTWORK_DIR}/res/toolpay.cur
-        ${ARTWORK_DIR}/res/toolsit.cur
+        res/arrow.cur
+        res/arrowcop.cur
+        res/arrowcopmulti.cur
+        res/arrowdrag.cur
+        res/circleandline.cur
+        res/icon1.ico
+        res/llarrow.cur
+        res/llarrowdrag.cur
+        res/llarrowdragmulti.cur
+        res/llarrowlocked.cur
+        res/llgrablocked.cur
+        res/llno.cur
+        res/llnolocked.cur
+        res/lltoolcamera.cur
+        res/lltoolcreate.cur
+        res/lltoolfocus.cur
+        res/lltoolgrab.cur
+        res/lltoolland.cur
+        res/lltoolpan.cur
+        res/lltoolpipette.cur
+        res/lltoolrotate.cur
+        res/lltoolscale.cur
+        res/lltooltranslate.cur
+        res/lltoolzoomin.cur
+        res/lltoolzoomout.cur
+        res/snowglobe_icon.BMP
+        res/snowglobe_icon.ico
+        res/resource.h
+        res/toolpickobject.cur
+        res/toolpickobject2.cur
+        res/toolpickobject3.cur
+        res/toolpipette.cur
+        res/toolbuy.cur
+        res/toolopen.cur
+        res/toolpay.cur
+        res/toolsit.cur
        )

    set_source_files_properties(${viewer_RESOURCE_FILES}
@@ -1320,22 +1319,20 @@ set_source_files_properties(${viewer_APPSETTINGS_FILES}

 list(APPEND viewer_SOURCE_FILES ${viewer_APPSETTINGS_FILES})

-if(ARTWORK_EXISTS)
-  set(viewer_CHARACTER_FILES
-    ${ARTWORK_DIR}/character/attentions.xml
-    ${ARTWORK_DIR}/character/attentionsN.xml
-    ${ARTWORK_DIR}/character/avatar_lad.xml
-    ${ARTWORK_DIR}/character/avatar_skeleton.xml
-    ${ARTWORK_DIR}/character/genepool.xml
+set(viewer_CHARACTER_FILES
+    character/attentions.xml
+    character/attentionsN.xml
+    character/avatar_lad.xml
+    character/avatar_skeleton.xml
+    character/genepool.xml
    )

-  source_group("Character File" FILES ${viewer_CHARACTER_FILES})
+source_group("Character File" FILES ${viewer_CHARACTER_FILES})

-  set_source_files_properties(${viewer_CHARACTER_FILES}
-                              PROPERTIES HEADER_FILE_ONLY TRUE)
+set_source_files_properties(${viewer_CHARACTER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)

-  list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
-endif(ARTWORK_EXISTS)
+list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})

 if (WINDOWS)
  file(GLOB viewer_INSTALLER_FILES installers/windows/*.nsi)
@@ -1401,10 +1398,6 @@ if (!DISABLE_TEMPLATE_CHECK)
 	check_message_template(${VIEWER_BINARY_NAME})
 endif (!DISABLE_TEMPLATE_CHECK)

-if (LLKDU_LIBRARY)
-  add_dependencies(${VIEWER_BINARY_NAME} ${LLKDU_LIBRARY})
-endif (LLKDU_LIBRARY)
-
 # We package by default on Linux so we can run from newview/packaged.
 if (LINUX)
  set(PACKAGE_DEFAULT ON)
--- a/indra/newview/ViewerArtwork.cmake
+++ b/indra/newview/ViewerArtwork.cmake
@@ -1,62 +0,0 @@
-set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
-    "Path to artwork files.")
-
-# Hide the ARTWORK_REQUIRED cache option by default.
-set(doc "Require artwork?")
-if(DEFINED ARTWORK_REQUIRED)
-  set(ARTWORK_REQUIRED "${ARTWORK_REQUIRED}" CACHE INTERNAL "${doc}")
-endif(DEFINED ARTWORK_REQUIRED)
-
-# Check if artwork is available.
-if(EXISTS "${ARTWORK_DIR}/res/arrow.cur")
-  set(ARTWORK_EXISTS 1)
-else(EXISTS "${ARTWORK_DIR}/res/arrow.cur")
-  set(ARTWORK_EXISTS 0)
-  if(PACKAGE)
-    set(ARTWORK_REQUIRED 1)
-    set(_ARTWORK_MESSAGE "Artwork is required to build a PACKAGE.")
-  elseif(WINDOWS)
-    set(ARTWORK_REQUIRED 1)
-    set(_ARTWORK_MESSAGE "Artwork is required to build on Windows.")
-  else()
-    option(ARTWORK_REQUIRED "${doc}" ON)
-    set(_ARTWORK_MESSAGE "Alternatively, disable ARTWORK_REQUIRED.")
-    # Show the option.
-    set(ARTWORK_REQUIRED "${ARTWORK_REQUIRED}" CACHE BOOL "${doc}" FORCE)
-  endif()
-endif(EXISTS "${ARTWORK_DIR}/res/arrow.cur")
-
-# Verify artwork setting.
-if(NOT ARTWORK_EXISTS AND ARTWORK_REQUIRED)
-  # Try to report the artwork asset URL.
-  set(asset_urls_file "${CMAKE_SOURCE_DIR}/../doc/asset_urls.txt")
-  if(EXISTS "${asset_urls_file}")
-    file(STRINGS "${asset_urls_file}" art_line REGEX "SLASSET_ART=")
-    string(REPLACE "SLASSET_ART=" "" SLASSET_ART "${art_line}")
-  endif(EXISTS "${asset_urls_file}")
-  if(NOT SLASSET_ART)
-    set(SLASSET_ART "http://wiki.secondlife.com/wiki/Source_downloads")
-  endif(NOT SLASSET_ART)
-
-  # Report missing artwork.
-  message(FATAL_ERROR
-    "The artwork directory\n"
-    "  ARTWORK_DIR = ${ARTWORK_DIR}\n"
-    "does not appear to contain the viewer artwork.  "
-    "Download artwork files from\n"
-    "  ${SLASSET_ART}\n"
-    "and extract the zip file.  "
-    "Then set the ARTWORK_DIR cache entry to point at "
-    "linden/indra/newview within the extracted directory.  "
-    "See the wiki for further help:\n"
-    "  http://wiki.secondlife.com/wiki/Get_source_and_compile\n"
-    "${_ARTWORK_MESSAGE}"
-    )
-endif(NOT ARTWORK_EXISTS AND ARTWORK_REQUIRED)
-
-# Check if the artwork is in the source tree.
-if(EXISTS "${ARTWORK_DIR}/app_settings/CA.pem")
-  set(ARTWORK_IN_SOURCE 1)
-else(EXISTS "${ARTWORK_DIR}/app_settings/CA.pem")
-  set(ARTWORK_IN_SOURCE 0)
-endif(EXISTS "${ARTWORK_DIR}/app_settings/CA.pem")
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -186,15 +186,6 @@ class WindowsManifest(ViewerManifest):
                               'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"),
                  "SLPlugin.exe")

-        # need to get the kdu dll from any of the build directories as well
-        #~ try:
-            #~ self.path(self.find_existing_file('../llkdu/%s/llkdu.dll' % self.args['configuration'],
-            #~ '../../libraries/i686-win32/lib/release/llkdu.dll'),
-                  #~ dst='llkdu.dll')
-            #~ pass
-        #~ except:
-            #~ print "Skipping llkdu.dll"
-            #~ pass
        self.path(src="licenses-win32.txt", dst="licenses.txt")

        self.path("featuretable.txt")