Automated merge with http://hg.lindenlab.com/viewer/viewer-2-0

16 files changed, 1423 insertions, 239 deletions

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 4563b59ad2..4fc25dcc24 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -16,7 +16,7 @@ set(cmake_SOURCE_FILES
     CARes.cmake
     CURL.cmake
     CMakeCopyIfDifferent.cmake
-    CopyWinLibs.cmake
+    Copy3rdPartyLibs.cmake
     CSharpMacros.cmake
     DBusGlib.cmake
     DirectX.cmake
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
new file mode 100644
index 0000000000..b26d4cbefb
--- /dev/null
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -0,0 +1,391 @@
+# -*- cmake -*-
+
+# The copy_win_libs folder contains file lists and a script used to
+# copy dlls, exes and such needed to run the SecondLife from within
+# VisualStudio.
+
+include(CMakeCopyIfDifferent)
+
+###################################################################
+# set up platform specific lists of files that need to be copied
+###################################################################
+if(WINDOWS)
+    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/Debug")
+    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo")
+    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release")
+
+    #*******************************
+    # VIVOX - *NOTE: no debug version
+    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
+    set(vivox_files
+        SLVoice.exe
+        alut.dll
+        vivoxsdk.dll
+        ortp.dll
+        wrap_oal.dll
+        )
+
+    #*******************************
+    # Misc shared libs 
+
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
+    set(debug_files
+        openjpegd.dll
+        libtcmalloc_minimal-debug.dll
+        libapr-1.dll
+        libaprutil-1.dll
+        libapriconv-1.dll
+        )
+
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
+    set(release_files
+        openjpeg.dll
+        libtcmalloc_minimal.dll
+        libapr-1.dll
+        libaprutil-1.dll
+        libapriconv-1.dll
+        )
+
+    if (FMOD_SDK_DIR)
+        set(fmod_files fmod.dll)
+    endif (FMOD_SDK_DIR)
+
+    #*******************************
+    # LLKDU
+    set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
+    if(NOT EXISTS ${internal_llkdu_path})
+        if (EXISTS "${debug_src_dir}/llkdu.dll")
+            set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
+            set(debug_llkdu_dst "${SHARED_LIB_STAGING_DIR_DEBUG}/llkdu.dll")
+        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 "${SHARED_LIB_STAGING_DIR_RELEASE}/llkdu.dll")
+            set(relwithdebinfo_llkdu_dst "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}/llkdu.dll")
+        endif (EXISTS "${release_src_dir}/llkdu.dll")
+    endif (NOT EXISTS ${internal_llkdu_path})
+
+#*******************************
+# Copy MS C runtime dlls, required for packaging.
+# *TODO - Adapt this to support VC9
+if (MSVC80)
+    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
+        PATHS
+         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
+        NO_DEFAULT_PATH
+        NO_DEFAULT_PATH
+        )
+
+    if(EXISTS ${debug_msvc8_redist_path})
+        set(debug_msvc8_files
+            msvcr80d.dll
+            msvcp80d.dll
+            Microsoft.VC80.DebugCRT.manifest
+            )
+
+        copy_if_different(
+            ${debug_msvc8_redist_path}
+            "${SHARED_LIB_STAGING_DIR_DEBUG}"
+            out_targets
+            ${debug_msvc8_files}
+            )
+        set(third_party_targets ${third_party_targets} ${out_targets})
+
+    endif (EXISTS ${debug_msvc8_redist_path})
+
+    FIND_PATH(release_msvc8_redist_path msvcr80.dll
+        PATHS
+         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
+        NO_DEFAULT_PATH
+        NO_DEFAULT_PATH
+        )
+
+    if(EXISTS ${release_msvc8_redist_path})
+        set(release_msvc8_files
+            msvcr80.dll
+            msvcp80.dll
+            Microsoft.VC80.CRT.manifest
+            )
+
+        copy_if_different(
+            ${release_msvc8_redist_path}
+            "${SHARED_LIB_STAGING_DIR_RELEASE}"
+            out_targets
+            ${release_msvc8_files}
+            )
+        set(third_party_targets ${third_party_targets} ${out_targets})
+
+        copy_if_different(
+            ${release_msvc8_redist_path}
+            "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
+            out_targets
+            ${release_msvc8_files}
+            )
+        set(third_party_targets ${third_party_targets} ${out_targets})
+          
+    endif (EXISTS ${release_msvc8_redist_path})
+endif (MSVC80)
+
+elseif(DARWIN)
+    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
+    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
+    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release/Resources")
+
+    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/universal-darwin")
+    set(vivox_files
+        SLVoice
+        libalut.dylib
+        libopenal.dylib
+        libortp.dylib
+        libvivoxsdk.dylib
+       )
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_debug")
+    set(debug_files
+       )
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release")
+    set(release_files
+        libapr-1.0.3.7.dylib
+        libapr-1.0.3.8.dylib
+        libapr-1.dylib
+        libaprutil-1.0.3.8.dylib
+        libaprutil-1.0.3.9.dylib
+        libaprutil-1.dylib
+        libexpat.0.5.0.dylib
+        libexpat.dylib
+        libllqtwebkit.dylib
+        libndofdev.dylib
+       )
+
+    # fmod is statically linked on darwin
+    set(fmod_files "")
+
+    #*******************************
+    # LLKDU
+    set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
+    if(NOT EXISTS ${internal_llkdu_path})
+        if (EXISTS "${debug_src_dir}/libllkdu.dylib")
+            set(debug_llkdu_src "${debug_src_dir}/libllkdu.dylib")
+            set(debug_llkdu_dst "${SHARED_LIB_STAGING_DIR_DEBUG}/libllkdu.dylib")
+        endif (EXISTS "${debug_src_dir}/libllkdu.dylib")
+
+        if (EXISTS "${release_src_dir}/libllkdu.dylib")
+            set(release_llkdu_src "${release_src_dir}/libllkdu.dylib")
+            set(release_llkdu_dst "${SHARED_LIB_STAGING_DIR_RELEASE}/libllkdu.dylib")
+            set(relwithdebinfo_llkdu_dst "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}/libllkdu.dylib")
+        endif (EXISTS "${release_src_dir}/libllkdu.dylib")
+    endif (NOT EXISTS ${internal_llkdu_path})
+elseif(LINUX)
+    # linux is weird, multiple side by side configurations aren't supported
+    # and we don't seem to have any debug shared libs built yet anyways...
+    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}")
+    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
+    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
+
+    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
+    set(vivox_files
+        libalut.so
+        libopenal.so.1
+        libortp.so
+        libvivoxsdk.so
+        SLVoice
+       )
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib_debug")
+    set(debug_files
+       )
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib_release_client")
+    # *FIX - figure out what to do with duplicate libalut.so here -brad
+    set(release_files
+        libapr-1.so.0
+        libaprutil-1.so.0
+        libatk-1.0.so
+        libcrypto.so
+        libdb-4.2.so
+        libexpat.so
+        libgmock_main.so
+        libgmock.so.0
+        libgmodule-2.0.so
+        libgobject-2.0.so
+        libgtest_main.so
+        libgtest.so.0
+        libopenal.so
+        libopenjpeg.so
+        libssl.so
+        libstacktrace.so
+        libtcmalloc.so
+        libuuid.so
+        libz.so
+        libssl.so.0.9.7
+       )
+
+    if (FMOD_SDK_DIR)
+        set(fmod_files "libfmod-3.75.so")
+    endif (FMOD_SDK_DIR)
+
+    #*******************************
+    # LLKDU
+    set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
+    if(NOT EXISTS ${internal_llkdu_path})
+        if (EXISTS "${debug_src_dir}/libllkdu.so")
+            set(debug_llkdu_src "${debug_src_dir}/libllkdu.so")
+            set(debug_llkdu_dst "${SHARED_LIB_STAGING_DIR_DEBUG}/libllkdu.so")
+        endif (EXISTS "${debug_src_dir}/libllkdu.so")
+
+        if (EXISTS "${release_src_dir}/libllkdu.so")
+            set(release_llkdu_src "${release_src_dir}/libllkdu.so")
+            set(release_llkdu_dst "${SHARED_LIB_STAGING_DIR_RELEASE}/libllkdu.so")
+            set(relwithdebinfo_llkdu_dst "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}/libllkdu.so")
+        endif (EXISTS "${release_src_dir}/libllkdu.so")
+    endif(NOT EXISTS ${internal_llkdu_path})
+else(WINDOWS)
+    message(STATUS "WARNING: unrecognized platform for staging 3rd party libs, skipping...")
+    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
+    set(vivox_files "")
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib/debug")
+    set(debug_files "")
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib/release")
+    set(release_files "")
+
+    set(fmod_files "")
+
+    set(debug_llkdu_src "")
+    set(debug_llkdu_dst "")
+    set(release_llkdu_src "")
+    set(release_llkdu_dst "")
+    set(relwithdebinfo_llkdu_dst "")
+endif(WINDOWS)
+
+
+################################################################
+# Done building the file lists, now set up the copy commands.
+################################################################
+
+copy_if_different(
+    ${vivox_src_dir}
+    "${SHARED_LIB_STAGING_DIR_DEBUG}"
+    out_targets 
+   ${vivox_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+copy_if_different(
+    ${vivox_src_dir}
+    "${SHARED_LIB_STAGING_DIR_RELEASE}"
+    out_targets
+    ${vivox_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+copy_if_different(
+    ${vivox_src_dir}
+    "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
+    out_targets
+    ${vivox_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+
+
+copy_if_different(
+    ${debug_src_dir}
+    "${SHARED_LIB_STAGING_DIR_DEBUG}"
+    out_targets
+    ${debug_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+copy_if_different(
+    ${release_src_dir}
+    "${SHARED_LIB_STAGING_DIR_RELEASE}"
+    out_targets
+    ${release_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+copy_if_different(
+    ${release_src_dir}
+    "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
+    out_targets
+    ${release_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+if (FMOD_SDK_DIR)
+    copy_if_different(
+        ${FMOD_SDK_DIR} 
+        "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+        out_targets 
+        ${fmod_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
+    copy_if_different(
+        ${FMOD_SDK_DIR} 
+        "${CMAKE_CURRENT_BINARY_DIR}/Release"
+        out_targets 
+        ${fmod_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
+    copy_if_different(
+        ${FMOD_SDK_DIR} 
+        "${CMAKE_CURRENT_BINARY_DIR}/RelWithDbgInfo"
+        out_targets 
+        ${fmod_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
+endif (FMOD_SDK_DIR)
+
+#*******************************
+# LLKDU
+set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
+if(NOT EXISTS ${internal_llkdu_path})
+    if (EXISTS "${debug_llkdu_src}")
+        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 ${SHARED_LIB_STAGING_DIR_DEBUG}"
+            )
+        set(third_party_targets ${third_party_targets} $} ${debug_llkdu_dst})
+    endif (EXISTS "${debug_llkdu_src}")
+
+    if (EXISTS "${release_llkdu_src}")
+        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 ${SHARED_LIB_STAGING_DIR_RELEASE}"
+            )
+        set(third_party_targets ${third_party_targets} ${release_llkdu_dst})
+
+        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 ${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
+            )
+        set(third_party_targets ${third_party_targets} ${relwithdebinfo_llkdu_dst})
+    endif (EXISTS "${release_llkdu_src}")
+
+endif (NOT EXISTS ${internal_llkdu_path})
+
+
+add_custom_target(stage_third_party_libs ALL
+  DEPENDS 
+    ${third_party_targets}
+  )
diff --git a/indra/cmake/DeploySharedLibs.cmake b/indra/cmake/DeploySharedLibs.cmake
index a7e772bd75..663c272e50 100644
--- a/indra/cmake/DeploySharedLibs.cmake
+++ b/indra/cmake/DeploySharedLibs.cmake
@@ -6,8 +6,14 @@
 # BIN_NAME= The full path the the binary to search for dependecies.
 # SEARCH_DIRS= The full paths to dirs to search for dependencies.
 # DST_PATH= The full path where the dependecies will be copied. 
-include(GetPrerequisites)
+
+# *FIX:Mani - I pulled in the CMake 2.8 GetPrerequisites.cmake script here, because it works on windows where 2.6 did not.
+# Once we have officially upgraded to 2.8 we can just use that version of GetPrerequisites.cmake.
+get_filename_component(current_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
+include(${current_dir}/GetPrerequisites_2_8.cmake)
+
 message("Getting recursive dependencies for file: ${BIN_NAME}")
+
 set(EXCLUDE_SYSTEM 1)
 set(RECURSE 1)
 get_filename_component(EXE_PATH ${BIN_NAME} PATH)
@@ -26,42 +32,42 @@ endif(DEP_FILES)
 
 foreach(DEP_FILE ${DEP_FILES})
   if(FOUND_FILES)
-	list(FIND FOUND_FILES ${DEP_FILE} FOUND)
+    list(FIND FOUND_FILES ${DEP_FILE} FOUND)
   else(FOUND_FILES)
-	set(FOUND -1)
+    set(FOUND -1)
   endif(FOUND_FILES)
 
   if(FOUND EQUAL -1)
-	find_path(DEP_PATH ${DEP_FILE} PATHS ${SEARCH_DIRS} NO_DEFAULT_PATH)
-	if(DEP_PATH)
-	  set(FOUND_FILES ${FOUND_FILES} "${DEP_PATH}/${DEP_FILE}")
-	  set(DEP_PATH NOTFOUND) #reset DEP_PATH for the next find_path call.
-	else(DEP_PATH)
-	  set(MISSING_FILES ${MISSING_FILES} ${DEP_FILE})
-	endif(DEP_PATH)
+    find_path(DEP_PATH ${DEP_FILE} PATHS ${SEARCH_DIRS} NO_DEFAULT_PATH)
+    if(DEP_PATH)
+      set(FOUND_FILES ${FOUND_FILES} "${DEP_PATH}/${DEP_FILE}")
+      set(DEP_PATH NOTFOUND) #reset DEP_PATH for the next find_path call.
+    else(DEP_PATH)
+      set(MISSING_FILES ${MISSING_FILES} ${DEP_FILE})
+    endif(DEP_PATH)
   endif(FOUND EQUAL -1)
 endforeach(DEP_FILE)
 
 if(MISSING_FILES)
   message("Missing:")
   foreach(FILE ${MISSING_FILES})
-	message("  ${FILE}")
+    message("  ${FILE}")
   endforeach(FILE)
   message("Searched in:")
   foreach(SEARCH_DIR ${SEARCH_DIRS})
-	message("  ${SEARCH_DIR}")
+    message("  ${SEARCH_DIR}")
   endforeach(SEARCH_DIR)
   message(FATAL_ERROR "Failed")
 endif(MISSING_FILES)
 
 if(FOUND_FILES)
   foreach(FILE ${FOUND_FILES})
-	get_filename_component(DST_FILE ${FILE} NAME)
-	set(DST_FILE "${DST_PATH}/${DST_FILE}")
-	message("Copying ${FILE} to ${DST_FILE}")
-	execute_process(
-	  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FILE} ${DST_FILE}
-	  )
+    get_filename_component(DST_FILE ${FILE} NAME)
+    set(DST_FILE "${DST_PATH}/${DST_FILE}")
+    message("Copying ${FILE} to ${DST_FILE}")
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FILE} ${DST_FILE}
+      )
   endforeach(FILE ${FOUND_FILES})
 endif(FOUND_FILES)
 message("Success!")
diff --git a/indra/cmake/GetPrerequisites_2_8.cmake b/indra/cmake/GetPrerequisites_2_8.cmake
new file mode 100644
index 0000000000..5a24842c89
--- /dev/null
+++ b/indra/cmake/GetPrerequisites_2_8.cmake
@@ -0,0 +1,786 @@
+# GetPrerequisites.cmake

+#

+# This script provides functions to list the .dll, .dylib or .so files that an

+# executable or shared library file depends on. (Its prerequisites.)

+#

+# It uses various tools to obtain the list of required shared library files:

+#   dumpbin (Windows)

+#   ldd (Linux/Unix)

+#   otool (Mac OSX)

+#

+# The following functions are provided by this script:

+#   gp_append_unique

+#   is_file_executable

+#   gp_item_default_embedded_path

+#     (projects can override with gp_item_default_embedded_path_override)

+#   gp_resolve_item

+#     (projects can override with gp_resolve_item_override)

+#   gp_resolved_file_type

+#   gp_file_type

+#   get_prerequisites

+#   list_prerequisites

+#   list_prerequisites_by_glob

+#

+# Requires CMake 2.6 or greater because it uses function, break, return and

+# PARENT_SCOPE.

+

+#=============================================================================

+# Copyright 2008-2009 Kitware, Inc.

+#

+# Distributed under the OSI-approved BSD License (the "License");

+# see accompanying file Copyright.txt for details.

+#

+# This software is distributed WITHOUT ANY WARRANTY; without even the

+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+# See the License for more information.

+#=============================================================================

+# (To distributed this file outside of CMake, substitute the full

+#  License text for the above reference.)

+

+# gp_append_unique list_var value

+#

+# Append value to the list variable ${list_var} only if the value is not

+# already in the list.

+#

+function(gp_append_unique list_var value)

+  set(contains 0)

+

+  foreach(item ${${list_var}})

+    if("${item}" STREQUAL "${value}")

+      set(contains 1)

+      break()

+    endif("${item}" STREQUAL "${value}")

+  endforeach(item)

+

+  if(NOT contains)

+    set(${list_var} ${${list_var}} "${value}" PARENT_SCOPE)

+  endif(NOT contains)

+endfunction(gp_append_unique)

+

+

+# is_file_executable file result_var

+#

+# Return 1 in ${result_var} if ${file} is a binary executable.

+#

+# Return 0 in ${result_var} otherwise.

+#

+function(is_file_executable file result_var)

+  #

+  # A file is not executable until proven otherwise:

+  #

+  set(${result_var} 0 PARENT_SCOPE)

+

+  get_filename_component(file_full "${file}" ABSOLUTE)

+  string(TOLOWER "${file_full}" file_full_lower)

+

+  # If file name ends in .exe on Windows, *assume* executable:

+  #

+  if(WIN32)

+    if("${file_full_lower}" MATCHES "\\.exe$")

+      set(${result_var} 1 PARENT_SCOPE)

+      return()

+    endif("${file_full_lower}" MATCHES "\\.exe$")

+

+    # A clause could be added here that uses output or return value of dumpbin

+    # to determine ${result_var}. In 99%+? practical cases, the exe name

+    # match will be sufficient...

+    #

+  endif(WIN32)

+

+  # Use the information returned from the Unix shell command "file" to

+  # determine if ${file_full} should be considered an executable file...

+  #

+  # If the file command's output contains "executable" and does *not* contain

+  # "text" then it is likely an executable suitable for prerequisite analysis

+  # via the get_prerequisites macro.

+  #

+  if(UNIX)

+    if(NOT file_cmd)

+      find_program(file_cmd "file")

+    endif(NOT file_cmd)

+

+    if(file_cmd)

+      execute_process(COMMAND "${file_cmd}" "${file_full}"

+        OUTPUT_VARIABLE file_ov

+        OUTPUT_STRIP_TRAILING_WHITESPACE

+        )

+

+      # Replace the name of the file in the output with a placeholder token

+      # (the string " _file_full_ ") so that just in case the path name of

+      # the file contains the word "text" or "executable" we are not fooled

+      # into thinking "the wrong thing" because the file name matches the

+      # other 'file' command output we are looking for...

+      #

+      string(REPLACE "${file_full}" " _file_full_ " file_ov "${file_ov}")

+      string(TOLOWER "${file_ov}" file_ov)

+

+      #message(STATUS "file_ov='${file_ov}'")

+      if("${file_ov}" MATCHES "executable")

+        #message(STATUS "executable!")

+        if("${file_ov}" MATCHES "text")

+          #message(STATUS "but text, so *not* a binary executable!")

+        else("${file_ov}" MATCHES "text")

+          set(${result_var} 1 PARENT_SCOPE)

+          return()

+        endif("${file_ov}" MATCHES "text")

+      endif("${file_ov}" MATCHES "executable")

+    else(file_cmd)

+      message(STATUS "warning: No 'file' command, skipping execute_process...")

+    endif(file_cmd)

+  endif(UNIX)

+endfunction(is_file_executable)

+

+

+# gp_item_default_embedded_path item default_embedded_path_var

+#

+# Return the path that others should refer to the item by when the item

+# is embedded inside a bundle.

+#

+# Override on a per-project basis by providing a project-specific

+# gp_item_default_embedded_path_override function.

+#

+function(gp_item_default_embedded_path item default_embedded_path_var)

+

+  # On Windows and Linux, "embed" prerequisites in the same directory

+  # as the executable by default:

+  #

+  set(path "@executable_path")

+  set(overridden 0)

+

+  # On the Mac, relative to the executable depending on the type

+  # of the thing we are embedding:

+  #

+  if(APPLE)

+    #

+    # The assumption here is that all executables in the bundle will be

+    # in same-level-directories inside the bundle. The parent directory

+    # of an executable inside the bundle should be MacOS or a sibling of

+    # MacOS and all embedded paths returned from here will begin with

+    # "@executable_path/../" and will work from all executables in all

+    # such same-level-directories inside the bundle.

+    #

+

+    # By default, embed things right next to the main bundle executable:

+    #

+    set(path "@executable_path/../../Contents/MacOS")

+

+    # Embed .dylibs right next to the main bundle executable:

+    #

+    if(item MATCHES "\\.dylib$")

+      set(path "@executable_path/../MacOS")

+      set(overridden 1)

+    endif(item MATCHES "\\.dylib$")

+

+    # Embed frameworks in the embedded "Frameworks" directory (sibling of MacOS):

+    #

+    if(NOT overridden)

+      if(item MATCHES "[^/]+\\.framework/")

+        set(path "@executable_path/../Frameworks")

+        set(overridden 1)

+      endif(item MATCHES "[^/]+\\.framework/")

+    endif(NOT overridden)

+  endif()

+

+  # Provide a hook so that projects can override the default embedded location

+  # of any given library by whatever logic they choose:

+  #

+  if(COMMAND gp_item_default_embedded_path_override)

+    gp_item_default_embedded_path_override("${item}" path)

+  endif(COMMAND gp_item_default_embedded_path_override)

+

+  set(${default_embedded_path_var} "${path}" PARENT_SCOPE)

+endfunction(gp_item_default_embedded_path)

+

+

+# gp_resolve_item context item exepath dirs resolved_item_var

+#

+# Resolve an item into an existing full path file.

+#

+# Override on a per-project basis by providing a project-specific

+# gp_resolve_item_override function.

+#

+function(gp_resolve_item context item exepath dirs resolved_item_var)

+  set(resolved 0)

+  set(resolved_item "${item}")

+

+  # Is it already resolved?

+  #

+  if(EXISTS "${resolved_item}")

+    set(resolved 1)

+  endif(EXISTS "${resolved_item}")

+

+  if(NOT resolved)

+    if(item MATCHES "@executable_path")

+      #

+      # @executable_path references are assumed relative to exepath

+      #

+      string(REPLACE "@executable_path" "${exepath}" ri "${item}")

+      get_filename_component(ri "${ri}" ABSOLUTE)

+

+      if(EXISTS "${ri}")

+        #message(STATUS "info: embedded item exists (${ri})")

+        set(resolved 1)

+        set(resolved_item "${ri}")

+      else(EXISTS "${ri}")

+        message(STATUS "warning: embedded item does not exist '${ri}'")

+      endif(EXISTS "${ri}")

+    endif(item MATCHES "@executable_path")

+  endif(NOT resolved)

+

+  if(NOT resolved)

+    if(item MATCHES "@loader_path")

+      #

+      # @loader_path references are assumed relative to the

+      # PATH of the given "context" (presumably another library)

+      #

+      get_filename_component(contextpath "${context}" PATH)

+      string(REPLACE "@loader_path" "${contextpath}" ri "${item}")

+      get_filename_component(ri "${ri}" ABSOLUTE)

+

+      if(EXISTS "${ri}")

+        #message(STATUS "info: embedded item exists (${ri})")

+        set(resolved 1)

+        set(resolved_item "${ri}")

+      else(EXISTS "${ri}")

+        message(STATUS "warning: embedded item does not exist '${ri}'")

+      endif(EXISTS "${ri}")

+    endif(item MATCHES "@loader_path")

+  endif(NOT resolved)

+

+  if(NOT resolved)

+    set(ri "ri-NOTFOUND")

+    find_file(ri "${item}" ${exepath} ${dirs} NO_DEFAULT_PATH)

+    find_file(ri "${item}" ${exepath} ${dirs} /usr/lib)

+    if(ri)

+      #message(STATUS "info: 'find_file' in exepath/dirs (${ri})")

+      set(resolved 1)

+      set(resolved_item "${ri}")

+      set(ri "ri-NOTFOUND")

+    endif(ri)

+  endif(NOT resolved)

+

+  if(NOT resolved)

+    if(item MATCHES "[^/]+\\.framework/")

+      set(fw "fw-NOTFOUND")

+      find_file(fw "${item}"

+        "~/Library/Frameworks"

+        "/Library/Frameworks"

+        "/System/Library/Frameworks"

+      )

+      if(fw)

+        #message(STATUS "info: 'find_file' found framework (${fw})")

+        set(resolved 1)

+        set(resolved_item "${fw}")

+        set(fw "fw-NOTFOUND")

+      endif(fw)

+    endif(item MATCHES "[^/]+\\.framework/")

+  endif(NOT resolved)

+

+  # Using find_program on Windows will find dll files that are in the PATH.

+  # (Converting simple file names into full path names if found.)

+  #

+  if(WIN32)

+  if(NOT resolved)

+    set(ri "ri-NOTFOUND")

+    find_program(ri "${item}" PATHS "${exepath};${dirs}" NO_DEFAULT_PATH)

+    find_program(ri "${item}" PATHS "${exepath};${dirs}")

+    if(ri)

+      #message(STATUS "info: 'find_program' in exepath/dirs (${ri})")

+      set(resolved 1)

+      set(resolved_item "${ri}")

+      set(ri "ri-NOTFOUND")

+    endif(ri)

+  endif(NOT resolved)

+  endif(WIN32)

+

+  # Provide a hook so that projects can override item resolution

+  # by whatever logic they choose:

+  #

+  if(COMMAND gp_resolve_item_override)

+    gp_resolve_item_override("${context}" "${item}" "${exepath}" "${dirs}" resolved_item resolved)

+  endif(COMMAND gp_resolve_item_override)

+

+  if(NOT resolved)

+    message(STATUS "

+warning: cannot resolve item '${item}'

+

+  possible problems:

+    need more directories?

+    need to use InstallRequiredSystemLibraries?

+    run in install tree instead of build tree?

+")

+#    message(STATUS "

+#******************************************************************************

+#warning: cannot resolve item '${item}'

+#

+#  possible problems:

+#    need more directories?

+#    need to use InstallRequiredSystemLibraries?

+#    run in install tree instead of build tree?

+#

+#    context='${context}'

+#    item='${item}'

+#    exepath='${exepath}'

+#    dirs='${dirs}'

+#    resolved_item_var='${resolved_item_var}'

+#******************************************************************************

+#")

+  endif(NOT resolved)

+

+  set(${resolved_item_var} "${resolved_item}" PARENT_SCOPE)

+endfunction(gp_resolve_item)

+

+

+# gp_resolved_file_type original_file file exepath dirs type_var

+#

+# Return the type of ${file} with respect to ${original_file}. String

+# describing type of prerequisite is returned in variable named ${type_var}.

+#

+# Use ${exepath} and ${dirs} if necessary to resolve non-absolute ${file}

+# values -- but only for non-embedded items.

+#

+# Possible types are:

+#   system

+#   local

+#   embedded

+#   other

+#

+function(gp_resolved_file_type original_file file exepath dirs type_var)

+  #message(STATUS "**")

+

+  if(NOT IS_ABSOLUTE "${original_file}")

+    message(STATUS "warning: gp_resolved_file_type expects absolute full path for first arg original_file")

+  endif()

+

+  set(is_embedded 0)

+  set(is_local 0)

+  set(is_system 0)

+

+  set(resolved_file "${file}")

+

+  if("${file}" MATCHES "^@(executable|loader)_path")

+    set(is_embedded 1)

+  endif()

+

+  if(NOT is_embedded)

+    if(NOT IS_ABSOLUTE "${file}")

+      gp_resolve_item("${original_file}" "${file}" "${exepath}" "${dirs}" resolved_file)

+    endif()

+

+    string(TOLOWER "${original_file}" original_lower)

+    string(TOLOWER "${resolved_file}" lower)

+

+    if(UNIX)

+      if(resolved_file MATCHES "^(/lib/|/lib32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/lib64/|/usr/X11R6/)")

+        set(is_system 1)

+      endif()

+    endif()

+

+    if(APPLE)

+      if(resolved_file MATCHES "^(/System/Library/|/usr/lib/)")

+        set(is_system 1)

+      endif()

+    endif()

+

+    if(WIN32)

+      string(TOLOWER "$ENV{SystemRoot}" sysroot)

+      string(REGEX REPLACE "\\\\" "/" sysroot "${sysroot}")

+

+      string(TOLOWER "$ENV{windir}" windir)

+      string(REGEX REPLACE "\\\\" "/" windir "${windir}")

+

+      if(lower MATCHES "^(${sysroot}/system|${windir}/system|${sysroot}/syswow|${windir}/syswow|(.*/)*msvc[^/]+dll)")

+        set(is_system 1)

+      endif()

+    endif()

+

+    if(NOT is_system)

+      get_filename_component(original_path "${original_lower}" PATH)

+      get_filename_component(path "${lower}" PATH)

+      if("${original_path}" STREQUAL "${path}")

+        set(is_local 1)

+      endif()

+    endif()

+  endif()

+

+  # Return type string based on computed booleans:

+  #

+  set(type "other")

+

+  if(is_system)

+    set(type "system")

+  elseif(is_embedded)

+    set(type "embedded")

+  elseif(is_local)

+    set(type "local")

+  endif()

+

+  #message(STATUS "gp_resolved_file_type: '${file}' '${resolved_file}'")

+  #message(STATUS "                type: '${type}'")

+

+  if(NOT is_embedded)

+    if(NOT IS_ABSOLUTE "${resolved_file}")

+      if(lower MATCHES "^msvc[^/]+dll" AND is_system)

+        message(STATUS "info: non-absolute msvc file '${file}' returning type '${type}'")

+      else()

+        message(STATUS "warning: gp_resolved_file_type non-absolute file '${file}' returning type '${type}' -- possibly incorrect")

+      endif()

+    endif()

+  endif()

+

+  set(${type_var} "${type}" PARENT_SCOPE)

+

+  #message(STATUS "**")

+endfunction()

+

+

+# gp_file_type original_file file type_var

+#

+# Return the type of ${file} with respect to ${original_file}. String

+# describing type of prerequisite is returned in variable named ${type_var}.

+#

+# Possible types are:

+#   system

+#   local

+#   embedded

+#   other

+#

+function(gp_file_type original_file file type_var)

+  if(NOT IS_ABSOLUTE "${original_file}")

+    message(STATUS "warning: gp_file_type expects absolute full path for first arg original_file")

+  endif()

+

+  get_filename_component(exepath "${original_file}" PATH)

+

+  set(type "")

+  gp_resolved_file_type("${original_file}" "${file}" "${exepath}" "" type)

+

+  set(${type_var} "${type}" PARENT_SCOPE)

+endfunction(gp_file_type)

+

+

+# get_prerequisites target prerequisites_var exclude_system recurse dirs

+#

+# Get the list of shared library files required by ${target}. The list in

+# the variable named ${prerequisites_var} should be empty on first entry to

+# this function. On exit, ${prerequisites_var} will contain the list of

+# required shared library files.

+#

+#  target is the full path to an executable file

+#

+#  prerequisites_var is the name of a CMake variable to contain the results

+#

+#  exclude_system is 0 or 1: 0 to include "system" prerequisites , 1 to

+#   exclude them

+#

+#  recurse is 0 or 1: 0 for direct prerequisites only, 1 for all prerequisites

+#   recursively

+#

+#  exepath is the path to the top level executable used for @executable_path

+#   replacment on the Mac

+#

+#  dirs is a list of paths where libraries might be found: these paths are

+#   searched first when a target without any path info is given. Then standard

+#   system locations are also searched: PATH, Framework locations, /usr/lib...

+#

+function(get_prerequisites target prerequisites_var exclude_system recurse exepath dirs)

+  set(verbose 0)

+  set(eol_char "E")

+

+  if(NOT IS_ABSOLUTE "${target}")

+    message("warning: target '${target}' is not absolute...")

+  endif(NOT IS_ABSOLUTE "${target}")

+

+  if(NOT EXISTS "${target}")

+    message("warning: target '${target}' does not exist...")

+  endif(NOT EXISTS "${target}")

+

+  # <setup-gp_tool-vars>

+  #

+  # Try to choose the right tool by default. Caller can set gp_tool prior to

+  # calling this function to force using a different tool.

+  #

+  if("${gp_tool}" STREQUAL "")

+    set(gp_tool "ldd")

+    if(APPLE)

+      set(gp_tool "otool")

+    endif(APPLE)

+    if(WIN32)

+      set(gp_tool "dumpbin")

+    endif(WIN32)

+  endif("${gp_tool}" STREQUAL "")

+

+  set(gp_tool_known 0)

+

+  if("${gp_tool}" STREQUAL "ldd")

+    set(gp_cmd_args "")

+    set(gp_regex "^[\t ]*[^\t ]+ => ([^\t ]+).*${eol_char}$")

+    set(gp_regex_cmp_count 1)

+    set(gp_tool_known 1)

+  endif("${gp_tool}" STREQUAL "ldd")

+

+  if("${gp_tool}" STREQUAL "otool")

+    set(gp_cmd_args "-L")

+    set(gp_regex "^\t([^\t]+) \\(compatibility version ([0-9]+.[0-9]+.[0-9]+), current version ([0-9]+.[0-9]+.[0-9]+)\\)${eol_char}$")

+    set(gp_regex_cmp_count 3)

+    set(gp_tool_known 1)

+  endif("${gp_tool}" STREQUAL "otool")

+

+  if("${gp_tool}" STREQUAL "dumpbin")

+    set(gp_cmd_args "/dependents")

+    set(gp_regex "^    ([^ ].*[Dd][Ll][Ll])${eol_char}$")

+    set(gp_regex_cmp_count 1)

+    set(gp_tool_known 1)

+    set(ENV{VS_UNICODE_OUTPUT} "") # Block extra output from inside VS IDE.

+  endif("${gp_tool}" STREQUAL "dumpbin")

+

+  if(NOT gp_tool_known)

+    message(STATUS "warning: gp_tool='${gp_tool}' is an unknown tool...")

+    message(STATUS "CMake function get_prerequisites needs more code to handle '${gp_tool}'")

+    message(STATUS "Valid gp_tool values are dumpbin, ldd and otool.")

+    return()

+  endif(NOT gp_tool_known)

+

+  set(gp_cmd_paths ${gp_cmd_paths}

+    "C:/Program Files/Microsoft Visual Studio 9.0/VC/bin"

+    "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"

+    "C:/Program Files/Microsoft Visual Studio 8/VC/BIN"

+    "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN"

+    "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN"

+    "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN"

+    "/usr/local/bin"

+    "/usr/bin"

+    )

+

+  find_program(gp_cmd ${gp_tool} PATHS ${gp_cmd_paths})

+

+  if(NOT gp_cmd)

+    message(STATUS "warning: could not find '${gp_tool}' - cannot analyze prerequisites...")

+    return()

+  endif(NOT gp_cmd)

+

+  if("${gp_tool}" STREQUAL "dumpbin")

+    # When running dumpbin, it also needs the "Common7/IDE" directory in the

+    # PATH. It will already be in the PATH if being run from a Visual Studio

+    # command prompt. Add it to the PATH here in case we are running from a

+    # different command prompt.

+    #

+    get_filename_component(gp_cmd_dir "${gp_cmd}" PATH)

+    get_filename_component(gp_cmd_dlls_dir "${gp_cmd_dir}/../../Common7/IDE" ABSOLUTE)

+    if(EXISTS "${gp_cmd_dlls_dir}")

+      # only add to the path if it is not already in the path

+      if(NOT "$ENV{PATH}" MATCHES "${gp_cmd_dlls_dir}")

+        set(ENV{PATH} "$ENV{PATH};${gp_cmd_dlls_dir}")

+      endif(NOT "$ENV{PATH}" MATCHES "${gp_cmd_dlls_dir}")

+    endif(EXISTS "${gp_cmd_dlls_dir}")

+  endif("${gp_tool}" STREQUAL "dumpbin")

+  #

+  # </setup-gp_tool-vars>

+

+  if("${gp_tool}" STREQUAL "ldd")

+    set(old_ld_env "$ENV{LD_LIBRARY_PATH}")

+    foreach(dir ${exepath} ${dirs})

+      set(ENV{LD_LIBRARY_PATH} "${dir}:$ENV{LD_LIBRARY_PATH}")

+    endforeach(dir)

+  endif("${gp_tool}" STREQUAL "ldd")

+

+

+  # Track new prerequisites at each new level of recursion. Start with an

+  # empty list at each level:

+  #

+  set(unseen_prereqs)

+

+  # Run gp_cmd on the target:

+  #

+  execute_process(

+    COMMAND ${gp_cmd} ${gp_cmd_args} ${target}

+    OUTPUT_VARIABLE gp_cmd_ov

+    )

+

+  if("${gp_tool}" STREQUAL "ldd")

+    set(ENV{LD_LIBRARY_PATH} "${old_ld_env}")

+  endif("${gp_tool}" STREQUAL "ldd")

+

+  if(verbose)

+    message(STATUS "<RawOutput cmd='${gp_cmd} ${gp_cmd_args} ${target}'>")

+    message(STATUS "gp_cmd_ov='${gp_cmd_ov}'")

+    message(STATUS "</RawOutput>")

+  endif(verbose)

+

+  get_filename_component(target_dir "${target}" PATH)

+

+  # Convert to a list of lines:

+  #

+  string(REGEX REPLACE ";" "\\\\;" candidates "${gp_cmd_ov}")

+  string(REGEX REPLACE "\n" "${eol_char};" candidates "${candidates}")

+

+  # Analyze each line for file names that match the regular expression:

+  #

+  foreach(candidate ${candidates})

+  if("${candidate}" MATCHES "${gp_regex}")

+    # Extract information from each candidate:

+    string(REGEX REPLACE "${gp_regex}" "\\1" raw_item "${candidate}")

+

+    if(gp_regex_cmp_count GREATER 1)

+      string(REGEX REPLACE "${gp_regex}" "\\2" raw_compat_version "${candidate}")

+      string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" "\\1" compat_major_version "${raw_compat_version}")

+      string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" "\\2" compat_minor_version "${raw_compat_version}")

+      string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" "\\3" compat_patch_version "${raw_compat_version}")

+    endif(gp_regex_cmp_count GREATER 1)

+

+    if(gp_regex_cmp_count GREATER 2)

+      string(REGEX REPLACE "${gp_regex}" "\\3" raw_current_version "${candidate}")

+      string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" "\\1" current_major_version "${raw_current_version}")

+      string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" "\\2" current_minor_version "${raw_current_version}")

+      string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" "\\3" current_patch_version "${raw_current_version}")

+    endif(gp_regex_cmp_count GREATER 2)

+

+    # Use the raw_item as the list entries returned by this function. Use the

+    # gp_resolve_item function to resolve it to an actual full path file if

+    # necessary.

+    #

+    set(item "${raw_item}")

+

+    # Add each item unless it is excluded:

+    #

+    set(add_item 1)

+

+    if(${exclude_system})

+      set(type "")

+      gp_resolved_file_type("${target}" "${item}" "${exepath}" "${dirs}" type)

+      if("${type}" STREQUAL "system")

+        set(add_item 0)

+      endif("${type}" STREQUAL "system")

+    endif(${exclude_system})

+

+    if(add_item)

+      list(LENGTH ${prerequisites_var} list_length_before_append)

+      gp_append_unique(${prerequisites_var} "${item}")

+      list(LENGTH ${prerequisites_var} list_length_after_append)

+

+      if(${recurse})

+        # If item was really added, this is the first time we have seen it.

+        # Add it to unseen_prereqs so that we can recursively add *its*

+        # prerequisites...

+        #

+        # But first: resolve its name to an absolute full path name such

+        # that the analysis tools can simply accept it as input.

+        #

+        if(NOT list_length_before_append EQUAL list_length_after_append)

+          gp_resolve_item("${target}" "${item}" "${exepath}" "${dirs}" resolved_item)

+          set(unseen_prereqs ${unseen_prereqs} "${resolved_item}")

+        endif(NOT list_length_before_append EQUAL list_length_after_append)

+      endif(${recurse})

+    endif(add_item)

+  else("${candidate}" MATCHES "${gp_regex}")

+    if(verbose)

+      message(STATUS "ignoring non-matching line: '${candidate}'")

+    endif(verbose)

+  endif("${candidate}" MATCHES "${gp_regex}")

+  endforeach(candidate)

+

+  list(LENGTH ${prerequisites_var} prerequisites_var_length)

+  if(prerequisites_var_length GREATER 0)

+    list(SORT ${prerequisites_var})

+  endif(prerequisites_var_length GREATER 0)

+  if(${recurse})

+    set(more_inputs ${unseen_prereqs})

+    foreach(input ${more_inputs})

+      get_prerequisites("${input}" ${prerequisites_var} ${exclude_system} ${recurse} "${exepath}" "${dirs}")

+    endforeach(input)

+  endif(${recurse})

+

+  set(${prerequisites_var} ${${prerequisites_var}} PARENT_SCOPE)

+endfunction(get_prerequisites)

+

+

+# list_prerequisites target all exclude_system verbose

+#

+#  ARGV0 (target) is the full path to an executable file

+#

+#  optional ARGV1 (all) is 0 or 1: 0 for direct prerequisites only,

+#   1 for all prerequisites recursively

+#

+#  optional ARGV2 (exclude_system) is 0 or 1: 0 to include "system"

+#   prerequisites , 1 to exclude them

+#

+#  optional ARGV3 (verbose) is 0 or 1: 0 to print only full path

+#   names of prerequisites, 1 to print extra information

+#

+function(list_prerequisites target)

+  if("${ARGV1}" STREQUAL "")

+    set(all 1)

+  else("${ARGV1}" STREQUAL "")

+    set(all "${ARGV1}")

+  endif("${ARGV1}" STREQUAL "")

+

+  if("${ARGV2}" STREQUAL "")

+    set(exclude_system 0)

+  else("${ARGV2}" STREQUAL "")

+    set(exclude_system "${ARGV2}")

+  endif("${ARGV2}" STREQUAL "")

+

+  if("${ARGV3}" STREQUAL "")

+    set(verbose 0)

+  else("${ARGV3}" STREQUAL "")

+    set(verbose "${ARGV3}")

+  endif("${ARGV3}" STREQUAL "")

+

+  set(count 0)

+  set(count_str "")

+  set(print_count "${verbose}")

+  set(print_prerequisite_type "${verbose}")

+  set(print_target "${verbose}")

+  set(type_str "")

+

+  get_filename_component(exepath "${target}" PATH)

+

+  set(prereqs "")

+  get_prerequisites("${target}" prereqs ${exclude_system} ${all} "${exepath}" "")

+

+  if(print_target)

+    message(STATUS "File '${target}' depends on:")

+  endif(print_target)

+

+  foreach(d ${prereqs})

+    math(EXPR count "${count} + 1")

+

+    if(print_count)

+      set(count_str "${count}. ")

+    endif(print_count)

+

+    if(print_prerequisite_type)

+      gp_file_type("${target}" "${d}" type)

+      set(type_str " (${type})")

+    endif(print_prerequisite_type)

+

+    message(STATUS "${count_str}${d}${type_str}")

+  endforeach(d)

+endfunction(list_prerequisites)

+

+

+# list_prerequisites_by_glob glob_arg glob_exp

+#

+#  glob_arg is GLOB or GLOB_RECURSE

+#

+#  glob_exp is a globbing expression used with "file(GLOB" to retrieve a list

+#   of matching files. If a matching file is executable, its prerequisites are

+#   listed.

+#

+# Any additional (optional) arguments provided are passed along as the

+# optional arguments to the list_prerequisites calls.

+#

+function(list_prerequisites_by_glob glob_arg glob_exp)

+  message(STATUS "=============================================================================")

+  message(STATUS "List prerequisites of executables matching ${glob_arg} '${glob_exp}'")

+  message(STATUS "")

+  file(${glob_arg} file_list ${glob_exp})

+  foreach(f ${file_list})

+    is_file_executable("${f}" is_f_executable)

+    if(is_f_executable)

+      message(STATUS "=============================================================================")

+      list_prerequisites("${f}" ${ARGN})

+      message(STATUS "")

+    endif(is_f_executable)

+  endforeach(f)

+endfunction(list_prerequisites_by_glob)

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index d8f64199cf..bf4d9b72a9 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -107,6 +107,8 @@ INCLUDE(GoogleMock)
 
     # Setup target
     ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES})
+    SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXE_STAGING_DIR})
+
     #
     # Per-codefile additional / external project dep and lib dep property extraction
     #
@@ -142,8 +144,10 @@ INCLUDE(GoogleMock)
     
     IF(WINDOWS)
       set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR})
+    ELSEIF(DARWIN)
+      set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources:/usr/lib)
     ELSE(WINDOWS)
-      set(LD_LIBRARY_PATH ${ARCH_PREBUILT_DIRS}:${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}:/usr/lib)
+      set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}:/usr/lib)
     ENDIF(WINDOWS)
 
     LL_TEST_COMMAND("${LD_LIBRARY_PATH}" ${TEST_CMD})
@@ -200,6 +204,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
     message(STATUS "ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})")
   endif(TEST_DEBUG)
   ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})
+  SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXE_STAGING_DIR})
 
   # Add link deps to the executable
   if(TEST_DEBUG)
@@ -230,8 +235,10 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
 
   IF(WINDOWS)
     set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR})
+  ELSEIF(DARWIN)
+    set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources:/usr/lib)
   ELSE(WINDOWS)
-    set(LD_LIBRARY_PATH ${ARCH_PREBUILT_DIRS}:${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}:/usr/lib)
+    set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}:/usr/lib)
   ENDIF(WINDOWS)
 
   LL_TEST_COMMAND("${LD_LIBRARY_PATH}" ${test_command})
@@ -250,4 +257,4 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
   # Use CTEST? Not sure how to yet...
   # ADD_TEST(INTEGRATION_TEST_RUNNER_${testname} ${TEST_SCRIPT_CMD})
 
-ENDFUNCTION(LL_ADD_INTEGRATION_TEST)
\ No newline at end of file
+ENDFUNCTION(LL_ADD_INTEGRATION_TEST)
diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake
index a8c81609bb..6f602680f4 100644
--- a/indra/cmake/LLSharedLibs.cmake
+++ b/indra/cmake/LLSharedLibs.cmake
@@ -1,31 +1,74 @@
 # ll_deploy_sharedlibs_command
 # target_exe: the cmake target of the executable for which the shared libs will be deployed.
-# search_dirs: a list of dirs to search for the dependencies
-# dst_path: path to copy deps to, relative to the output location of the target_exe
-macro(ll_deploy_sharedlibs_command target_exe search_dirs dst_path) 
-  get_target_property(OUTPUT_LOCATION ${target_exe} LOCATION)
-
+macro(ll_deploy_sharedlibs_command target_exe) 
+  get_target_property(TARGET_LOCATION ${target_exe} LOCATION)
+  get_filename_component(OUTPUT_PATH ${TARGET_LOCATION} PATH)
+  
   if(DARWIN)
+	set(SEARCH_DIRS "${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources")
     get_target_property(IS_BUNDLE ${target_exe} MACOSX_BUNDLE)
     if(IS_BUNDLE)
-      get_filename_component(TARGET_FILE ${OUTPUT_LOCATION} NAME)
-      set(OUTPUT_PATH ${OUTPUT_LOCATION}.app/Contents/MacOS)
-      set(OUTPUT_LOCATION ${OUTPUT_PATH}/${TARGET_FILE})
+	  # If its a bundle the exe is not in the target location, this should find it.
+      get_filename_component(TARGET_FILE ${TARGET_LOCATION} NAME)
+      set(OUTPUT_PATH ${TARGET_LOCATION}.app/Contents/MacOS)
+      set(TARGET_LOCATION ${OUTPUT_PATH}/${TARGET_FILE})
+	  set(OUTPUT_PATH ${OUTPUT_PATH}/../Resources)
     endif(IS_BUNDLE)
-  else(DARWIN)
-    message(FATAL_ERROR "Only darwin currently supported!")
+  elseif(WINDOWS)
+    set(SEARCH_DIRS "${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}" "$ENV{SystemRoot}/system32")
+  elseif(LINUX)
+	set(SEARCH_DIRS "${SHARED_LIB_STAGING_DIR}")
+	set(OUTPUT_PATH ${OUTPUT_PATH}/lib)
   endif(DARWIN)
-  
+
   add_custom_command(
     TARGET ${target_exe} POST_BUILD
     COMMAND ${CMAKE_COMMAND} 
     ARGS
-    "-DBIN_NAME=\"${OUTPUT_LOCATION}\""
-    "-DSEARCH_DIRS=\"${search_dirs}\""
-    "-DDST_PATH=\"${OUTPUT_PATH}/${dst_path}\""
+    "-DBIN_NAME=\"${TARGET_LOCATION}\""
+    "-DSEARCH_DIRS=\"${SEARCH_DIRS}\""
+    "-DDST_PATH=\"${OUTPUT_PATH}\""
     "-P"
     "${CMAKE_SOURCE_DIR}/cmake/DeploySharedLibs.cmake"
     )
 
 endmacro(ll_deploy_sharedlibs_command)
 
+# ll_stage_sharedlib
+# Performs config and adds a copy command for a sharedlib target.
+macro(ll_stage_sharedlib DSO_TARGET)
+  if(SHARED_LIB_STAGING_DIR)
+    # target gets written to the DLL staging directory.
+    # Also this directory is shared with RunBuildTest.cmake, y'know, for the tests.
+    set_target_properties(${DSO_TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR})
+    if(NOT WINDOWS)
+      get_target_property(DSO_PATH ${DSO_TARGET} LOCATION)
+      get_filename_component(DSO_FILE ${DSO_PATH} NAME)
+      if(DARWIN)
+        set(SHARED_LIB_STAGING_DIR_CONFIG ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources)
+      else(DARWIN)
+        set(SHARED_LIB_STAGING_DIR_CONFIG ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR})
+      endif(DARWIN)
+	  
+      # *TODO - maybe make this a symbolic link? -brad
+      add_custom_command(
+        TARGET ${DSO_TARGET} POST_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS
+          -E
+          copy_if_different
+          ${DSO_PATH}
+          ${SHARED_LIB_STAGING_DIR_CONFIG}/${DSO_FILE}
+          COMMENT "Copying llcommon to the staging folder."
+        )
+    endif(NOT WINDOWS)
+  endif(SHARED_LIB_STAGING_DIR)
+
+  if (DARWIN)
+    set_target_properties(${DSO_TARGET} PROPERTIES
+      BUILD_WITH_INSTALL_RPATH 1
+      INSTALL_NAME_DIR "@executable_path/../Resources"
+      )
+  endif(DARWIN)
+
+endmacro(ll_stage_sharedlib)
\ No newline at end of file
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 1f3553539f..bca99caf2a 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -6,6 +6,7 @@ if (NOT STANDALONE)
     set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release)
     set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
     set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged DLLs")
+    set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged executables")
   elseif (LINUX)
     if (VIEWER)
       set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client)
@@ -14,12 +15,14 @@ if (NOT STANDALONE)
     endif (VIEWER)
     set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
     set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
-    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged .sos")
+    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib CACHE FILEPATH "Location of staged .sos")
+    set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin CACHE FILEPATH "Location of staged executables")
   elseif (DARWIN)
     set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
     set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
     set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE})
     set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged DLLs")
+    set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs/\$(CONFIGURATION)" CACHE FILEPATH "Location of staged executables")
   endif (WINDOWS)
 endif (NOT STANDALONE)
 
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index 59c84e571b..8c05210618 100644
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -120,9 +120,8 @@ ARGUMENTS=[
          default=""),
     dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE),
     dict(name='configuration',
-         description="""The build configuration used. Only used on OS X for
-        now, but it could be used for other platforms as well.""",
-         default="Universal"),
+         description="""The build configuration used.""",
+         default="Release"),
     dict(name='dest', description='Destination directory.', default=DEFAULT_SRCTREE),
     dict(name='grid',
          description="""Which grid the client will try to connect to. Even
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index f785698612..f40359790a 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 # -*- cmake -*-
 
 project(llcommon)
@@ -6,11 +7,9 @@ include(00-Common)
 include(LLCommon)
 include(Linking)
 include(Boost)
-include (Pth)
-
-if (WINDOWS)
-    include(CopyWinLibs)
-endif (WINDOWS)
+include(Pth)
+include(LLSharedLibs)
+include(Copy3rdPartyLibs)
 
 include_directories(
     ${EXPAT_INCLUDE_DIRS}
@@ -243,35 +242,7 @@ list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
 
 if(LLCOMMON_LINK_SHARED)
     add_library (llcommon SHARED ${llcommon_SOURCE_FILES})
-
-    if(SHARED_LIB_STAGING_DIR)
-        # *FIX:Mani ---
-        # llcommon.dll get written to the DLL staging directory.
-        # Also this directory is shared with RunBuildTest.cmake, y'know, for the tests.
-        set_target_properties(llcommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR})
-        if(NOT WINDOWS)
-          get_target_property(LLCOMMON_PATH llcommon LOCATION)
-          get_filename_component(LLCOMMON_FILE ${LLCOMMON_PATH} NAME)
-          add_custom_command(
-            TARGET llcommon POST_BUILD
-            COMMAND ${CMAKE_COMMAND}
-            ARGS
-              -E
-              copy_if_different
-              ${LLCOMMON_PATH}
-              ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/${LLCOMMON_FILE}
-            COMMENT "Copying llcommon to the staging folder."
-            )
-        endif(NOT WINDOWS)
-    endif(SHARED_LIB_STAGING_DIR)
-
-    if (DARWIN)
-      set_target_properties(llcommon PROPERTIES
-        BUILD_WITH_INSTALL_RPATH 1
-        INSTALL_NAME_DIR "@executable_path/../Resources"
-        )
-    endif(DARWIN)
-
+	ll_stage_sharedlib(llcommon)
 else(LLCOMMON_LINK_SHARED)
     add_library (llcommon ${llcommon_SOURCE_FILES})
 endif(LLCOMMON_LINK_SHARED)
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt
index 1d6494fecf..420e836e36 100644
--- a/indra/mac_crash_logger/CMakeLists.txt
+++ b/indra/mac_crash_logger/CMakeLists.txt
@@ -75,7 +75,6 @@ add_custom_command(
     ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-crash-logger.app/Contents/Resources/CrashReporter.nib
   )
 
-ll_deploy_sharedlibs_command(
-  mac-crash-logger
-  "${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR};${ARCH_PREBUILT_DIRS}" 
-  "../Resources") 
+ll_deploy_sharedlibs_command(mac-crash-logger)
+
+
diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt
index d7bd6f993c..57d426aa24 100644
--- a/indra/mac_updater/CMakeLists.txt
+++ b/indra/mac_updater/CMakeLists.txt
@@ -77,7 +77,4 @@ add_custom_command(
     ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib
   )
 
-ll_deploy_sharedlibs_command(
-  mac-updater
-  "${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR};${ARCH_PREBUILT_DIRS}" 
-  "../Resources") 
+ll_deploy_sharedlibs_command(mac-updater) 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f10db9330c..b63183026a 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -185,7 +185,7 @@ set(viewer_SOURCE_FILES
     llfloatermediasettings.cpp
     llfloatermemleak.cpp
     llfloaternamedesc.cpp
-	llfloaternearbymedia.cpp
+        llfloaternearbymedia.cpp
     llfloaternotificationsconsole.cpp
     llfloateropenobject.cpp
     llfloaterparcel.cpp
@@ -679,7 +679,7 @@ set(viewer_HEADER_FILES
     llfloatermediasettings.h
     llfloatermemleak.h
     llfloaternamedesc.h
-	llfloaternearbymedia.h
+        llfloaternearbymedia.h
     llfloaternotificationsconsole.h
     llfloateropenobject.h
     llfloaterparcel.h
@@ -1165,7 +1165,7 @@ if (WINDOWS)
 
     if (NOT STANDALONE)
         list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES})
-    endif (NOT STANDALONE)	
+    endif (NOT STANDALONE)      
 
     find_library(DINPUT_LIBRARY dinput8 ${DIRECTX_LIBRARY_DIR})
     find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
@@ -1347,7 +1347,7 @@ file(GLOB EVENT_HOST_SCRIPT_GLOB_LIST
      ${CMAKE_CURRENT_SOURCE_DIR}/../viewer_components/*.py)
 list(APPEND EVENT_HOST_SCRIPTS ${EVENT_HOST_SCRIPT_GLOB_LIST})
 
-set(PACKAGE OFF CACHE BOOL
+set(PACKAGE ON CACHE BOOL
     "Add a package target that builds an installer package.")
 
 if (WINDOWS)
@@ -1376,7 +1376,7 @@ if (WINDOWS)
               ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
               --workingdir
               ${VIEWER_BINARY_NAME}
-              ${CMAKE_CURRENT_SOURCE_DIR}
+              "./${CMAKE_CFG_INTDIR}"
             COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
             )
     endif (NOT UNATTENDED)
@@ -1393,85 +1393,87 @@ if (WINDOWS)
         )
 
     add_custom_command(
-        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
-        COMMAND ${CMAKE_COMMAND}
-        ARGS
-          -E
-          copy_if_different
-          ${CMAKE_CURRENT_SOURCE_DIR}/../../etc/message.xml
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings/message.xml
-        COMMENT "Copying message.xml to the runtime folder."
-        )
+      TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
+      COMMAND ${CMAKE_COMMAND}
+      ARGS
+        -E
+        copy_if_different
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../etc/message.xml
+        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings/message.xml
+      COMMENT "Copying message.xml to the runtime folder."
+      )
        
-    if(WINDOWS)
-      # Copy Win Libs...
-      # This happens at build time, not config time. We can't glob files in this cmake.
-      # *FIX:Mani Write a sub script to glob the files...
-      # *FIX:Mani Use actually dependencies rather than bulk copy.
-      add_custom_command(
-        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
-        COMMAND ${CMAKE_COMMAND}
-        ARGS
-          -E
-          copy_directory
-          ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-        COMMENT "Copying staged dlls."
-        )
+    add_custom_command(
+      TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+      COMMAND ${PYTHON_EXECUTABLE}
+      ARGS
+        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+        --actions=copy
+        --artwork=${ARTWORK_DIR}
+        --build=${CMAKE_CURRENT_BINARY_DIR}
+        --configuration=${CMAKE_CFG_INTDIR}
+        --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
+        --grid=${GRID}
+        --source=${CMAKE_CURRENT_SOURCE_DIR}
+      DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+      COMMENT "Performing viewer_manifest copy"
+      )
 
-      add_dependencies(${VIEWER_BINARY_NAME} stage_third_party_libs llcommon)
-      if(LLKDU_LIBRARY)
-	# kdu may not exist!
-	add_dependencies(${VIEWER_BINARY_NAME} llkdu)
-      endif(LLKDU_LIBRARY)
-    endif(WINDOWS)    
+    add_dependencies(${VIEWER_BINARY_NAME} stage_third_party_libs llcommon)
+    
+    if(LLKDU_LIBRARY)
+      # kdu may not exist!
+      add_dependencies(${VIEWER_BINARY_NAME} llkdu)
+    endif(LLKDU_LIBRARY)
 
     if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
       add_dependencies(${VIEWER_BINARY_NAME} copy_win_scripts)
     endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
         
-    add_custom_command(
+    add_dependencies(${VIEWER_BINARY_NAME} 
+      SLPlugin 
+      media_plugin_quicktime 
+      media_plugin_webkit
+      windows-updater 
+      windows-crash-logger
+      )
+
+    if (PACKAGE)
+      add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py
+          ${CMAKE_CURRENT_SOURCE_DIR}/..
+          ${CMAKE_CURRENT_BINARY_DIR}
+          ${CMAKE_CFG_INTDIR}
+        DEPENDS 
+          lleventhost 
+          ${EVENT_HOST_SCRIPTS}
+          ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py
+        )
+
+      add_custom_command(
         OUTPUT ${CMAKE_CFG_INTDIR}/touched.bat
         COMMAND ${PYTHON_EXECUTABLE}
         ARGS
           ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-          --configuration=${CMAKE_CFG_INTDIR}
+          --artwork=${ARTWORK_DIR}
+          --build=${CMAKE_CURRENT_BINARY_DIR}
           --channel=${VIEWER_CHANNEL}
-          --login_channel=${VIEWER_LOGIN_CHANNEL}
+          --configuration=${CMAKE_CFG_INTDIR}
+          --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
           --grid=${GRID}
+          --login_channel=${VIEWER_LOGIN_CHANNEL}
           --source=${CMAKE_CURRENT_SOURCE_DIR}
-              --artwork=${ARTWORK_DIR}
-              --build=${CMAKE_CURRENT_BINARY_DIR}
-              --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-              --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
+          --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
         DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         )
 
-    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit)
-
-    if (PACKAGE)
-      add_custom_command(
-          OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2
-          COMMAND ${PYTHON_EXECUTABLE}
-          ARGS
-            ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py
-            ${CMAKE_CURRENT_SOURCE_DIR}/..
-            ${CMAKE_CURRENT_BINARY_DIR}
-            ${CMAKE_CFG_INTDIR}
-
-          DEPENDS 
-            lleventhost 
-            ${EVENT_HOST_SCRIPTS}
-            ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py)
-
-      add_custom_target(package ALL 
-          DEPENDS 
-            ${CMAKE_CFG_INTDIR}/touched.bat)
-            # temporarily disable packaging of event_host until hg subrepos get
-            # sorted out on the parabuild cluster...
-            #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2)
-      add_dependencies(package windows-updater windows-crash-logger)
-
+      add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
+        # temporarily disable packaging of event_host until hg subrepos get
+        # sorted out on the parabuild cluster...
+        #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2)
 
     endif (PACKAGE)
 endif (WINDOWS)
@@ -1534,15 +1536,16 @@ if (LINUX)
       COMMAND ${PYTHON_EXECUTABLE}
       ARGS
         ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-        --grid=${GRID}
-        --channel=${VIEWER_CHANNEL}
-        --login_channel=${VIEWER_LOGIN_CHANNEL}
-        --installer_name=${product}
         --arch=${ARCH}
-        --source=${CMAKE_CURRENT_SOURCE_DIR}
         --artwork=${ARTWORK_DIR}
         --build=${CMAKE_CURRENT_BINARY_DIR}
+        --channel=${VIEWER_CHANNEL}
+        --configuration=${CMAKE_CFG_INTDIR}
         --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged
+        --grid=${GRID}
+        --installer_name=${product}
+        --login_channel=${VIEWER_LOGIN_CHANNEL}
+        --source=${CMAKE_CURRENT_SOURCE_DIR}
         --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
       DEPENDS secondlife-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
       )
@@ -1577,13 +1580,13 @@ if (DARWIN)
     COMMAND ${PYTHON_EXECUTABLE}
     ARGS
       ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-      --grid=${GRID}
       --actions=copy
-      --configuration=${CMAKE_CFG_INTDIR}
-      --source=${CMAKE_CURRENT_SOURCE_DIR}
       --artwork=${ARTWORK_DIR}
       --build=${CMAKE_CURRENT_BINARY_DIR}
+      --configuration=${CMAKE_CFG_INTDIR}
       --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
+      --grid=${GRID}
+      --source=${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index b85d31d1ac..7e5c30a978 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -231,8 +231,21 @@ class WindowsManifest(ViewerManifest):
                                'llplugin', 'slplugin', self.args['configuration'], "slplugin.exe"),
                   "slplugin.exe")
         
-        # need to get the llcommon.dll from the build directory as well
-        if self.prefix(src=self.args['configuration'], dst=""):
+        self.disable_manifest_check()
+
+        # Get shared libs from the shared libs staging directory
+        if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']),
+                       dst=""):
+
+            self.enable_crt_manifest_check()
+            
+            # Get kdu dll, continue if missing.
+            try:
+                self.path('%s/llkdu.dll' % self.args['configuration'], dst='llkdu.dll')
+            except RuntimeError:
+                print "Skipping llkdu.dll"
+
+            # Get llcommon and deps. If missing assume static linkage and continue.
             try:
                 self.path('llcommon.dll')
                 self.path('libapr-1.dll')
@@ -242,22 +255,41 @@ class WindowsManifest(ViewerManifest):
                 print err.message
                 print "Skipping llcommon.dll (assuming llcommon was linked statically)"
 
-            self.end_prefix()
+            self.disable_manifest_check()
 
-        # need to get the kdu dll from the build directory as well
-        try:
-            self.path('%s/llkdu.dll' % self.args['configuration'], dst='llkdu.dll')
-        except RuntimeError:
-            print "Skipping llkdu.dll"
-
-        self.disable_manifest_check()
-
-        # For textures
-        if self.prefix(src=self.args['configuration'], dst=""):
-            if(self.args['configuration'].lower() == 'debug'):
+            # For textures
+            if self.args['configuration'].lower() == 'debug':
                 self.path("openjpegd.dll")
             else:
                 self.path("openjpeg.dll")
+
+            # These need to be installed as a SxS assembly, currently a 'private' assembly.
+            # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
+            if self.args['configuration'].lower() == 'debug':
+                self.path("msvcr80d.dll")
+                self.path("msvcp80d.dll")
+                self.path("Microsoft.VC80.DebugCRT.manifest")
+            else:
+                self.path("msvcr80.dll")
+                self.path("msvcp80.dll")
+                self.path("Microsoft.VC80.CRT.manifest")
+
+            # Vivox runtimes
+            self.path("SLVoice.exe")
+            self.path("alut.dll")
+            self.path("vivoxsdk.dll")
+            self.path("ortp.dll")
+            self.path("wrap_oal.dll")
+
+            # For google-perftools tcmalloc allocator.
+            try:
+                if self.args['configuration'].lower() == 'debug':
+                    self.path('libtcmalloc_minimal-debug.dll')
+                else:
+                    self.path('libtcmalloc_minimal.dll')
+            except:
+                print "Skipping libtcmalloc_minimal.dll"
+
             self.end_prefix()
 
         self.path(src="licenses-win32.txt", dst="licenses.txt")
@@ -270,6 +302,7 @@ class WindowsManifest(ViewerManifest):
         self.path("fmod.dll")
 
         self.enable_no_crt_manifest_check()
+        
         # Media plugins - QuickTime
         if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
             self.path("media_plugin_quicktime.dll")
@@ -302,28 +335,6 @@ class WindowsManifest(ViewerManifest):
 
         self.disable_manifest_check()
 
-        # These need to be installed as a SxS assembly, currently a 'private' assembly.
-        # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
-        if self.prefix(src=self.args['configuration'], dst=""):
-            if self.args['configuration'] == 'Debug':
-                self.path("msvcr80d.dll")
-                self.path("msvcp80d.dll")
-                self.path("Microsoft.VC80.DebugCRT.manifest")
-            else:
-                self.path("msvcr80.dll")
-                self.path("msvcp80.dll")
-                self.path("Microsoft.VC80.CRT.manifest")
-            self.end_prefix()
-
-        # Vivox runtimes
-        if self.prefix(src=self.args['configuration'], dst=""):
-            self.path("SLVoice.exe")
-            self.path("alut.dll")
-            self.path("vivoxsdk.dll")
-            self.path("ortp.dll")
-            self.path("wrap_oal.dll")
-            self.end_prefix()
-
         # pull in the crash logger and updater from other projects
         # tag:"crash-logger" here as a cue to the exporter
         self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'],
@@ -331,17 +342,6 @@ class WindowsManifest(ViewerManifest):
         self.path(src='../win_updater/%s/windows-updater.exe' % self.args['configuration'],
                   dst="updater.exe")
 
-        # For google-perftools tcmalloc allocator.
-        if self.prefix(src=self.args['configuration'], dst=""):
-            try:
-                if self.args['configuration'] == 'Debug':
-                    self.path('libtcmalloc_minimal-debug.dll')
-                else:
-                    self.path('libtcmalloc_minimal.dll')
-            except:
-                print "Skipping libtcmalloc_minimal.dll"
-            self.end_prefix()
-
     def nsi_file_commands(self, install=True):
         def wpath(path):
             if path.endswith('/') or path.endswith(os.path.sep):
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index 53b981cccd..0011daaec6 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -7,6 +7,7 @@ include(FindOpenGL)
 include(LLCommon)
 include(LLPlugin)
 include(Linking)
+include(LLSharedLibs)
 include(PluginAPI)
 include(LLImage)
 include(LLMath)
@@ -324,27 +325,7 @@ if (DARWIN)
       make_directory
       ${PLUGINS_DESTINATION_DIR}
     COMMENT "Creating Resources directory in app bundle."
-  )
-
-  # copy the llcommon dylib and its dependencies to Contents/Resources.
-  get_target_property(BUILT_LLCOMMON llcommon LOCATION)
-  add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_LLCOMMON}  ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${BUILT_LLCOMMON}
-  )
-  # FIXME: these paths should come from somewhere reliable.  The canonical list seems to be in indra/newview/viewer_manifest.py
-  add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib  ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib
-  )
-  add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib  ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib
-  )
-  add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.0.5.0.dylib  ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.0.5.0.dylib
-  )
+  ) 
 else (DARWIN)
   set(PLUGINS_DESTINATION_DIR
     ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
@@ -497,22 +478,14 @@ if(WINDOWS)
     ${plugintest_release_files}
     )
   set(plugin_test_targets ${plugin_test_targets} ${out_targets})
-
-  copy_if_different(
-    "${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}"
-    "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
-    out_targets
-    llcommon.dll libapr-1.dll libaprutil-1.dll libapriconv-1.dll
-    )
-  set(plugin_test_targets ${plugin_test_targets} ${out_targets})
-
-  add_custom_target(copy_plugintest_libs ALL
-    DEPENDS 
-      ${plugin_test_targets}
-      llcommon
-    )
+ 
+   add_custom_target(copy_plugintest_libs ALL
+     DEPENDS 
+     ${plugin_test_targets}
+     )
 
   add_dependencies(llmediaplugintest copy_plugintest_libs)
 
 endif(WINDOWS)
 
+ll_deploy_sharedlibs_command(llmediaplugintest) 
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 0bd59f0990..990dc6783e 100644
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -11,6 +11,7 @@ include(LLVFS)
 include(LLWindow)
 include(LLXML)
 include(Linking)
+include(LLSharedLibs)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
@@ -87,3 +88,5 @@ if (WINDOWS)
         LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
         )
 endif (WINDOWS)
+
+ll_deploy_sharedlibs_command(windows-crash-logger)
\ No newline at end of file
diff --git a/indra/win_updater/CMakeLists.txt b/indra/win_updater/CMakeLists.txt
index dedb7cfcc7..82347adf20 100644
--- a/indra/win_updater/CMakeLists.txt
+++ b/indra/win_updater/CMakeLists.txt
@@ -33,3 +33,6 @@ set_target_properties(windows-updater
     LINK_FLAGS "/NODEFAULTLIB:LIBCMT"
     LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
     )
+
+# The windows-updater doesn't link against anything non-system, apparently
+#ll_deploy_sharedlibs_command(windows-updater)
\ No newline at end of file