Moved build dirs out of indra directory. installed.xml and prebuilts are now per-build-target. Added support for v3 prebuilt package layout.

2014-12-03 22:36:42 -06:00
parent 7ddef751ef
commit 958031dbaf
44 changed files with 502 additions and 458 deletions
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -14,25 +14,25 @@ else (STANDALONE)
  use_prebuilt_binary(apr_suite)
  if (WINDOWS)
    set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.lib
+      debug libapr-1.lib
+      optimized libapr-1.lib
      )
    set(APRICONV_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapriconv-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapriconv-1.lib
+      debug libapriconv-1.lib
+      optimized libapriconv-1.lib
      )
    set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.lib ${APRICONV_LIBRARIES}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.lib ${APRICONV_LIBRARIES}
+      debug libaprutil-1.lib
+      optimized libaprutil-1.lib
      )
  elseif (DARWIN)
    set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
+      debug libapr-1.0.dylib
+      optimized libapr-1.0.dylib
      )
-    set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.dylib
+    set(APRUTIL_LIBRARIES
+      debug libaprutil-1.dylib
+      optimized libaprutil-1.dylib
      )
    set(APRICONV_LIBRARIES iconv)
  else (WINDOWS)
@@ -40,7 +40,10 @@ else (STANDALONE)
    set(APRUTIL_LIBRARIES aprutil-1)
    set(APRICONV_LIBRARIES iconv)
  endif (WINDOWS)
-  set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
+  set(APR_INCLUDE_DIR
+    ${LIBS_PREBUILT_DIR}/include/apr-1
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/apr-1
+    )

  if (LINUX)
    list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -9,7 +9,10 @@ if (STANDALONE)
  pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
 else (STANDALONE)
  use_prebuilt_binary(ogg-vorbis)
-  set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(VORBIS_INCLUDE_DIRS
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
  set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
  set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})

--- a/indra/cmake/BerkeleyDB.cmake
+++ b/indra/cmake/BerkeleyDB.cmake
@@ -13,5 +13,8 @@ else (STANDALONE)
  else (LINUX)
    set(DB_LIBRARIES db-4.2)
  endif (LINUX)
-  set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(DB_INCLUDE_DIRS
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
 endif (STANDALONE)
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -11,7 +11,10 @@ if (STANDALONE)
  find_package(Boost 1.51.0 COMPONENTS date_time filesystem program_options regex system thread wave context)
 else (STANDALONE)
  use_prebuilt_binary(boost)
-  set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(Boost_INCLUDE_DIRS
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
  set(Boost_VERSION "1.52")

  if (WINDOWS)
--- a/indra/cmake/CARes.cmake
+++ b/indra/cmake/CARes.cmake
@@ -13,12 +13,15 @@ else (STANDALONE)
        add_definitions("-DCARES_STATICLIB")
        set(CARES_LIBRARIES areslib)
    elseif (DARWIN)
-        set(CARES_LIBRARIES
-          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.a
-          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcares.a
+        set(APR_LIBRARIES 
+          debug libcares.a
+          optimized libcares.a
          )
    else (WINDOWS)
        set(CARES_LIBRARIES cares)
    endif (WINDOWS)
-    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ares)
+    set(CARES_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/include/ares
+      ${LIBS_PREBUILT_LEGACY_DIR}/include/ares
+      )
 endif (STANDALONE)
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -18,5 +18,8 @@ else (STANDALONE)
      list(APPEND CURL_LIBRARIES idn)
    endif(LINUX AND WORD_SIZE EQUAL 64)
  endif (WINDOWS)
-  set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(CURL_INCLUDE_DIRS
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
 endif (STANDALONE)
--- a/indra/cmake/Colladadom.cmake
+++ b/indra/cmake/Colladadom.cmake
@@ -20,9 +20,11 @@ else (STANDALONE)
  endif (NOT DARWIN AND NOT WINDOWS)

  set(COLLADADOM_INCLUDE_DIRS
-	  ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/collada
-	  ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/collada/1.4
-	  )
+    ${LIBS_PREBUILT_DIR}/include/collada
+    ${LIBS_PREBUILT_DIR}/include/collada/1.4
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/collada
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/collada/1.4
+    )

  if (WINDOWS)
 	  if(MSVC12)
--- a/indra/cmake/CopyWinLibs.cmake
+++ b/indra/cmake/CopyWinLibs.cmake
@@ -1,328 +0,0 @@
-# -*- 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)
-
-if(WORD_SIZE EQUAL 32)
-    set(debug_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
-    set(release_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
-else(WORD_SIZE EQUAL 32)
-    set(debug_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/x86_64-win/lib/debug")
-    set(release_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/x86_64-win/lib/release")
-endif(WORD_SIZE EQUAL 32)
-
-set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
-set(vivox_files
-    ca-bundle.crt
-    libsndfile-1.dll
-    ortp.dll
-    SLVoice.exe
-    vivoxoal.dll
-    vivoxplatform.dll
-    vivoxsdk.dll
-    zlib1.dll
-    )
-copy_if_different(
-    ${vivox_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
-    out_targets
-    ${vivox_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-
-set(debug_src_dir "${debug_libs_dir}")
-set(debug_files
-    libhunspell.dll
-    libapr-1.dll
-    libaprutil-1.dll
-    libapriconv-1.dll
-    libeay32.dll
-    ssleay32.dll
-    glod.dll
-    )
-  if(MSVC10)
-    set(release_files ${release_files}
-        libcollada14dom22-d.dll
-    )
-  endif(MSVC10)
-
-copy_if_different(
-    ${debug_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
-    out_targets 
-    ${debug_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Debug config runtime files required for the plugin test mule
-set(plugintest_debug_src_dir "${debug_libs_dir}")
-set(plugintest_debug_files
-    libeay32.dll
-    qtcored4.dll
-    qtguid4.dll
-    qtnetworkd4.dll
-    qtopengld4.dll
-    qtwebkitd4.dll
-    ssleay32.dll
-    )
-copy_if_different(
-    ${plugintest_debug_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug"
-    out_targets
-    ${plugintest_debug_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Debug config runtime files required for the plugin test mule (Qt image format plugins)
-set(plugintest_debug_src_dir "${debug_libs_dir}/imageformats")
-set(plugintest_debug_files
-    qgifd4.dll
-    qicod4.dll
-    qjpegd4.dll
-    qmngd4.dll
-    qsvgd4.dll
-    qtiffd4.dll
-    )
-copy_if_different(
-    ${plugintest_debug_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug/imageformats"
-    out_targets
-    ${plugintest_debug_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugintest_debug_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/llplugin/imageformats"
-    out_targets
-    ${plugintest_debug_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Release & ReleaseDebInfo config runtime files required for the plugin test mule
-set(plugintest_release_src_dir "${release_libs_dir}")
-set(plugintest_release_files
-    libeay32.dll
-    qtcore4.dll
-    qtgui4.dll
-    qtnetwork4.dll
-    qtopengl4.dll
-    qtwebkit4.dll
-    ssleay32.dll
-    )
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
-set(plugintest_release_src_dir "${release_libs_dir}/imageformats")
-set(plugintest_release_files
-    qgif4.dll
-    qico4.dll
-    qjpeg4.dll
-    qmng4.dll
-    qsvg4.dll
-    qtiff4.dll
-    )
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release/imageformats"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo/imageformats"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin/imageformats"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin/imageformats"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Debug config runtime files required for the plugins
-set(plugins_debug_src_dir "${debug_libs_dir}")
-set(plugins_debug_files
-    libeay32.dll
-    qtcored4.dll
-    qtguid4.dll
-    qtnetworkd4.dll
-    qtopengld4.dll
-    qtwebkitd4.dll
-    ssleay32.dll
-    )
-copy_if_different(
-    ${plugins_debug_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/Debug/llplugin"
-    out_targets
-    ${plugins_debug_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Release & ReleaseDebInfo config runtime files required for the plugins
-set(plugins_release_src_dir "${release_libs_dir}")
-set(plugins_release_files
-    libeay32.dll
-    qtcore4.dll
-    qtgui4.dll
-    qtnetwork4.dll
-    qtopengl4.dll
-    qtwebkit4.dll
-    ssleay32.dll
-    )
-copy_if_different(
-    ${plugins_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin"
-    out_targets
-    ${plugins_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugins_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin"
-    out_targets
-    ${plugins_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-
-set(release_src_dir "${release_libs_dir}")
-set(release_files
-    libhunspell.dll
-    libapr-1.dll
-    libaprutil-1.dll
-    libapriconv-1.dll
-    libeay32.dll
-    ssleay32.dll
-    glod.dll
-    )
-
-if(WORD_SIZE EQUAL 32)
-    set(release_files ${release_files}
-    libcollada14dom22.dll
-    libtcmalloc_minimal.dll
-    )
-endif(WORD_SIZE EQUAL 32)
-
-if(FMODSTUDIO)
-    if (WORD_SIZE EQUAL 32)
-        set(fmodstudio_dll_file "fmod.dll")
-    else (WORD_SIZE EQUAL 32)
-        set(fmodstudio_dll_file "fmod64.dll")
-    endif (WORD_SIZE EQUAL 32)
-    
-    find_path(FMODSTUDIO_BINARY_DIR "${fmodstudio_dll_file}"
-          "${release_src_dir}"
-          "${FMODSTUDIO_SDK_DIR}/api/lowlevel/lib"
-          "${FMODSTUDIO_SDK_DIR}"
-          NO_DEFAULT_PATH
-          )
-
-    if(FMODSTUDIO_BINARY_DIR)
-        copy_if_different("${FMODSTUDIO_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets "${fmodstudio_dll_file}")
-        set(all_targets ${all_targets} ${out_targets})
-        copy_if_different("${FMODSTUDIO_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets "${fmodstudio_dll_file}")
-        set(all_targets ${all_targets} ${out_targets})
-        copy_if_different("${FMODSTUDIO_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets "${fmodstudio_dll_file}")
-        set(all_targets ${all_targets} ${out_targets})
-    endif(FMODSTUDIO_BINARY_DIR)
-endif(FMODSTUDIO)
-
-if(FMODEX)
-    if (WORD_SIZE EQUAL 32)
-        set(fmodex_dll_file "fmodex.dll")
-    else (WORD_SIZE EQUAL 32)
-        set(fmodex_dll_file "fmodex64.dll")
-    endif (WORD_SIZE EQUAL 32)
-    
-    find_path(FMODEX_BINARY_DIR "${fmodex_dll_file}"
-          "${release_src_dir}"
-          "${FMODEX_SDK_DIR}/api"
-          "${FMODEX_SDK_DIR}"
-          NO_DEFAULT_PATH
-          )
-
-    if(FMODEX_BINARY_DIR)
-        copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets "${fmodex_dll_file}")
-        set(all_targets ${all_targets} ${out_targets})
-        copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets "${fmodex_dll_file}")
-        set(all_targets ${all_targets} ${out_targets})
-        copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets "${fmodex_dll_file}")
-        set(all_targets ${all_targets} ${out_targets})
-    endif(FMODEX_BINARY_DIR)
-endif(FMODEX)
-
-copy_if_different(
-    ${release_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Release"
-    out_targets 
-    ${release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${vivox_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Release"
-    out_targets 
-    ${vivox_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${release_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-    out_targets 
-    ${release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${vivox_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-    out_targets 
-    ${vivox_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-add_custom_target(copy_win_libs ALL
-  DEPENDS 
-    ${all_targets}
-    ${release_appconfig_file} 
-    ${relwithdebinfo_appconfig_file} 
-    ${debug_appconfig_file}
-  )
-add_dependencies(copy_win_libs prepare)
-
--- a/indra/cmake/CopyWinLibs.cmake.in
+++ b/indra/cmake/CopyWinLibs.cmake.in
@@ -0,0 +1,238 @@
+# -*- 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. 
+
+set(LIBS_PREBUILT_DIR "@LIBS_PREBUILT_DIR@")
+set(LIBS_PREBUILT_LEGACY_DIR "@LIBS_PREBUILT_LEGACY_DIR@")
+set(FMODSTUDIO_SDK_DIR "@FMODSTUDIO_SDK_DIR@")
+set(FMODEX_SDK_DIR "@FMODEX_SDK_DIR@")
+set(FMODSTUDIO @FMODSTUDIO@)
+set(FMODEX @FMODEX@)
+set(MSVC10 "@MSVC10@")
+set(WORD_SIZE "@WORD_SIZE@")
+
+set(LIBS_RELEASE_DIR
+  ${LIBS_PREBUILT_DIR}/lib/release
+  ${LIBS_PREBUILT_LEGACY_DIR}/lib/release
+  )
+set(LIBS_DEBUG_DIR
+  ${LIBS_PREBUILT_DIR}/lib/debug
+  ${LIBS_PREBUILT_LEGACY_DIR}/lib/debug
+  )
+
+function(copy_files paths names dest)
+  foreach(f ${names})
+    foreach(p ${paths})
+	  set(from_file "${p}/${f}")
+	  set(to_dest "${CMAKE_BINARY_DIR}/newview/${dest}")
+	  if(EXISTS ${from_file})
+	    message("Copying ${from_file} to ${to_dest}")
+		if(NOT EXISTS ${to_dest})
+		  execute_process(COMMAND mkdir -p "${to_dest}")
+		endif(NOT EXISTS ${to_dest})
+	    execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${from_file} ${to_dest} RESULT_VARIABLE result)
+		if(${result})
+		  message(SEND_ERROR "Unsuccessful.")
+		endif(${result})
+		set(found 1)
+		break()
+	  endif(EXISTS ${from_file})
+    endforeach(p)
+	if(NOT found)
+      message(SEND_ERROR "Failed to find library: ${f}")
+    endif(NOT found)
+  endforeach(f)
+endfunction(copy_files)
+
+set(vivox_files
+    ca-bundle.crt
+    libsndfile-1.dll
+    ortp.dll
+    SLVoice.exe
+    vivoxoal.dll
+    vivoxplatform.dll
+    vivoxsdk.dll
+    zlib1.dll
+    )
+copy_files("${LIBS_RELEASE_DIR}" "${vivox_files}" "Release" )
+copy_files("${LIBS_RELEASE_DIR}" "${vivox_files}" "RelWithDebInfo")
+copy_files("${LIBS_DEBUG_DIR}" "${vivox_files}" "Debug")
+
+set(release_files
+    libhunspell.dll
+    libapr-1.dll
+    libaprutil-1.dll
+    libapriconv-1.dll
+    libeay32.dll
+    ssleay32.dll
+    glod.dll
+	qtcore4.dll
+    )
+copy_files("${LIBS_RELEASE_DIR}" "${release_files}" "Release")
+copy_files("${LIBS_RELEASE_DIR}" "${release_files}" "RelWithDebInfo")
+copy_files("${LIBS_DEBUG_DIR}" "${release_files}" "Debug")
+
+if(MSVC10)
+   copy_files("${LIBS_DEBUG_DIR}" "libcollada14dom22-d.dll" "Debug")
+endif(MSVC10)
+
+if(WORD_SIZE EQUAL 32)
+set(release_files
+  libcollada14dom22.dll
+  libtcmalloc_minimal.dll
+  )
+  copy_files("${LIBS_RELEASE_DIR}" "${release_files}" "Release")
+  copy_files("${LIBS_RELEASE_DIR}" "${release_files}" "RelWithDebInfo")
+endif(WORD_SIZE EQUAL 32)
+
+set(plugins_release_files
+    libeay32.dll
+    qtcore4.dll
+    qtgui4.dll
+    qtnetwork4.dll
+    qtopengl4.dll
+    qtwebkit4.dll
+    ssleay32.dll
+	qtxmlpatterns4.dll
+	)
+copy_files("${LIBS_RELEASE_DIR}" "${plugins_release_files}" "Release/llplugin")
+copy_files("${LIBS_RELEASE_DIR}" "${plugins_release_files}" "RelWithDebInfo/llplugin")
+if(0)
+ copy_files("${LIBS_RELEASE_DIR}" "${plugin_release_files}" "../test_apps/llplugintest/Release")
+ copy_files("${LIBS_RELEASE_DIR}" "${plugin_release_files}" "../test_apps/llplugintest/RelWithDebInfo")
+endif(0)
+
+# Debug config runtime files required for the plugins
+set(plugins_debug_files
+    libeay32.dll
+    qtcored4.dll
+    qtguid4.dll
+    qtnetworkd4.dll
+    qtopengld4.dll
+    qtwebkitd4.dll
+    ssleay32.dll
+	qtxmlpatternsd4.dll
+    )
+copy_files("${LIBS_DEBUG_DIR}" "${plugins_debug_files}" "Debug/llplugin")
+if(0)
+  copy_files("${LIBS_DEBUG_DIR}" "${plugins_debug_files}" "../test_apps/llplugintest/Debug")
+endif(0)
+
+# Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
+set(plugin_image_release_files
+    qgif4.dll
+    qico4.dll
+    qjpeg4.dll
+    qmng4.dll
+    qsvg4.dll
+    qtiff4.dll
+    )
+copy_files("${LIBS_RELEASE_DIR}/imageformats" "${plugin_image_release_files}" "Release/llplugin/imageformats")
+copy_files("${LIBS_RELEASE_DIR}/imageformats" "${plugin_image_release_files}" "RelWithDebInfo/llplugin/imageformats")
+if(0)
+  copy_files("${LIBS_RELEASE_DIR}/imageformats" "${plugin_image_release_files}" "../test_apps/llplugintest/imageformats/Release")
+  copy_files("${LIBS_RELEASE_DIR}/imageformats" "${plugin_image_release_files}" "../test_apps/llplugintest/imageformats/RelWithDebInfo")
+endif(0)
+
+
+# Debug config runtime files required for the plugin test mule (Qt image format plugins)
+set(plugin_image_debug_files
+    qgifd4.dll
+    qicod4.dll
+    qjpegd4.dll
+    qmngd4.dll
+    qsvgd4.dll
+    qtiffd4.dll
+    )
+copy_files("${LIBS_DEBUG_DIR}/imageformats" "${plugin_image_debug_files}" "Debug/llplugin/imageformats")
+if(0)
+  copy_files("${LIBS_DEBUG_DIR}/imageformats" "${plugin_image_debug_files}" "../test_apps/llplugintest/imageformats/Debug")
+endif(0)
+
+# Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
+set(plugin_codec_release_files
+    qcncodecs4.dll
+    qjpcodecs4.dll
+    qkrcodecs4.dll
+    qtwcodecs4.dll
+    )
+copy_files("${LIBS_RELEASE_DIR}/codecs" "${plugin_codec_release_files}" "Release/llplugin/codecs")
+copy_files("${LIBS_RELEASE_DIR}/codecs" "${plugin_codec_release_files}" "RelWithDebInfo/llplugin/codecs")
+if(0)
+  copy_files("${LIBS_RELEASE_DIR}/codecs" "${plugin_codec_release_files}" "../test_apps/llplugintest/codecs/Release")
+  copy_files("${LIBS_RELEASE_DIR}/codecs" "${plugin_codec_release_files}" "../test_apps/llplugintest/codecs/RelWithDebInfo")
+endif(0)
+
+# Debug config runtime files required for the plugin test mule (Qt image format plugins)
+set(plugin_codec_debug_files
+    qcncodecsd4.dll
+    qjpcodecsd4.dll
+    qkrcodecsd4.dll
+    qtwcodecsd4.dll
+    )
+copy_files("${LIBS_DEBUG_DIR}/codecs" "${plugin_codec_debug_files}" "Debug/llplugin/codecs")
+if(0)
+  copy_files("${LIBS_DEBUG_DIR}/codecs" "${plugin_codec_debug_files}" "../test_apps/llplugintest/codecs/Debug")
+endif(0)
+
+if(FMODSTUDIO)
+    if (WORD_SIZE EQUAL 32)
+        set(fmodstudio_dll_file "fmod.dll")
+    else (WORD_SIZE EQUAL 32)
+        set(fmodstudio_dll_file "fmod64.dll")
+    endif (WORD_SIZE EQUAL 32)
+    
+    find_path(FMODSTUDIO_BINARY_RELEASE_DIR "${fmodstudio_dll_file}"
+	      ${LIBS_RELEASE_DIR}
+          "${FMODSTUDIO_SDK_DIR}/api/lowlevel/lib"
+          "${FMODSTUDIO_SDK_DIR}"
+          NO_DEFAULT_PATH
+          )
+	find_path(FMODSTUDIO_BINARY_DEBUG_DIR "${fmodstudio_dll_file}"
+	      ${LIBS_DEBUG_DIR}
+          "${FMODSTUDIO_SDK_DIR}/api/lowlevel/lib"
+		  "${FMODSTUDIO_SDK_DIR}"
+          NO_DEFAULT_PATH
+          )
+
+    if(FMODSTUDIO_BINARY_RELEASE_DIR)
+		copy_files(${FMODSTUDIO_BINARY_RELEASE_DIR} ${fmodstudio_dll_file} "Release")
+		copy_files(${FMODSTUDIO_BINARY_RELEASE_DIR} ${fmodstudio_dll_file} "RelWithDebInfo")
+    endif(FMODSTUDIO_BINARY_RELEASE_DIR)
+	if(FMODSTUDIO_BINARY_DEBUG_DIR)
+		copy_files(${FMODSTUDIO_BINARY_DEBUG_DIR} ${fmodstudio_dll_file} "Debug")
+	endif(FMODSTUDIO_BINARY_DEBUG_DIR)
+endif(FMODSTUDIO)
+
+if(FMODEX)
+    if (WORD_SIZE EQUAL 32)
+        set(fmodex_dll_file "fmodex.dll")
+    else (WORD_SIZE EQUAL 32)
+        set(fmodex_dll_file "fmodex64.dll")
+    endif (WORD_SIZE EQUAL 32)
+    
+	find_path(FMODEX_BINARY_RELEASE_DIR "${fmodex_dll_file}"
+          ${LIBS_RELEASE_DIR}
+          "${FMODEX_SDK_DIR}/api"
+          "${FMODEX_SDK_DIR}"
+          NO_DEFAULT_PATH
+          )
+	find_path(FMODEX_BINARY_DEBUG_DIR "${fmodex_dll_file}"
+          ${LIBS_DEBUG_DIR}
+          "${FMODSTUDIO_SDK_DIR}/api"
+          "${FMODSTUDIO_SDK_DIR}"
+          NO_DEFAULT_PATH
+          )
+
+    if(FMODEX_BINARY_RELEASE_DIR)
+		copy_files(${FMODEX_BINARY_RELEASE_DIR ${fmodex_dll_file} "Release")
+		copy_files(${FMODEX_BINARY_RELEASE_DIR ${fmodex_dll_file} "RelWithDebInfo")
+    endif(FMODEX_BINARY_RELEASE_DIR)
+	if(FMODEX_BINARY_DEBUG_DIR)
+		copy_files(${FMODEX_BINARY_DEBUG_DIR ${fmodex_dll_file} "Debug")
+	endif(FMODEX_BINARY_DEBUG_DIR)
+endif(FMODEX)
+
+
--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
@@ -10,8 +10,9 @@ elseif (LINUX)
  use_prebuilt_binary(dbusglib)
  set(DBUSGLIB_FOUND ON FORCE BOOL)
  set(DBUSGLIB_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/dbus
-      )
+    ${LIBS_PREBUILT_DIR}/include/dbus
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/dbus
+    )
  # We don't need to explicitly link against dbus-glib itself, because
  # the viewer probes for the system's copy at runtime.
  set(DBUSGLIB_LIBRARIES
--- a/indra/cmake/DownloadPrebuilt.cmake.in
+++ b/indra/cmake/DownloadPrebuilt.cmake.in
@@ -2,7 +2,7 @@
 # The top-level CMakeLists.txt configures packages and tool locations.
 set(packages "@PREBUILT_PACKAGES@")
 set(python "@PYTHON_EXECUTABLE@")
-set(install_dir "@CMAKE_SOURCE_DIR@/..")
+set(install_dir "@CMAKE_BINARY_DIR@/packages")
 set(scp "@SCP_EXECUTABLE@")
 set(scripts_dir "@SCRIPTS_DIR@")
 set(sentinel_dir "@CMAKE_BINARY_DIR@/prepare")
@@ -20,7 +20,7 @@ foreach(package ${packages})
    # This package is missing or out of date.
    message(STATUS "Obtaining${proprietary_message} prebuilt '${package}'")
    execute_process(
-      COMMAND ${python} install.py -p${prebuilt_type} --install-dir=${install_dir} ${scp_option} ${package}
+      COMMAND ${python} install.py -p${prebuilt_type} --install-dir=${install_dir} --installed-manifest=${install_dir}/installed.xml ${scp_option} ${package}
      WORKING_DIRECTORY ${scripts_dir}
      RESULT_VARIABLE result
      )
--- a/indra/cmake/ELFIO.cmake
+++ b/indra/cmake/ELFIO.cmake
@@ -8,7 +8,10 @@ if (STANDALONE)
 elseif (LINUX)
  use_prebuilt_binary(elfio)
  set(ELFIO_LIBRARIES ELFIO)
-  set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(ELFIO_INCLUDE_DIR
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
  set(ELFIO_FOUND "YES")
 endif (STANDALONE)

--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
@@ -17,5 +17,8 @@ else (STANDALONE)
    else (WINDOWS)
        set(EXPAT_LIBRARIES expat)
    endif (WINDOWS)
-    set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    set(EXPAT_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      )
 endif (STANDALONE)
--- a/indra/cmake/FMODEX.cmake
+++ b/indra/cmake/FMODEX.cmake
@@ -57,8 +57,8 @@ if (NOT FMODEX_LIBRARY)
 endif (NOT FMODEX_LIBRARY)

 find_path(FMODEX_INCLUDE_DIR fmod.hpp
-          "${LIBS_PREBUILT_DIR}/include/fmodex"
-          "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex"
+          ${LIBS_PREBUILT_DIR}/include/fmodex
+          ${LIBS_PREBUILT_LEGACY_DIR}/include/fmodex
          "${FMODEX_SDK_DIR}/api/inc"
          "${FMODEX_SDK_DIR}/inc"
          "${FMODEX_SDK_DIR}"
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -55,8 +55,8 @@ if (NOT FMODSTUDIO_LIBRARY)
 endif (NOT FMODSTUDIO_LIBRARY)

 find_path(FMODSTUDIO_INCLUDE_DIR fmod.hpp
-          "${LIBS_PREBUILT_DIR}/include/fmodstudio"
-          "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodstudio"
+          ${LIBS_PREBUILT_DIR}/include/fmodstudio
+          ${LIBS_PREBUILT_LEGACY_DIR}/include/fmodstudio
          "${FMODSTUDIO_SDK_DIR}/api/lowlevel/inc"
          "${FMODSTUDIO_SDK_DIR}"
          )
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -7,16 +7,17 @@ if (STANDALONE)
  pkg_check_modules(FREETYPE REQUIRED freetype2)
 else (STANDALONE)
  use_prebuilt_binary(freetype)
-  if (LINUX)
+  if(MSVC12)
    set(FREETYPE_INCLUDE_DIRS
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-  else (LINUX)
-    if(MSVC12)
-      set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/freetype2)
-    else(MSVC12)
-      set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-	endif (MSVC12)
-  endif (LINUX)
+      ${LIBS_PREBUILT_DIR}/include/freetype2
+      ${LIBS_PREBUILT_LEGACY_DIR}/include/freetype2
+      )
+  else(MSVC12)
+    set(FREETYPE_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      )
+  endif (MSVC12)

  set(FREETYPE_LIBRARIES freetype)
 endif (STANDALONE)
--- a/indra/cmake/GLOD.cmake
+++ b/indra/cmake/GLOD.cmake
@@ -8,6 +8,9 @@ if (STANDALONE)
  include(FindGLOD)
 else (STANDALONE)
  use_prebuilt_binary(GLOD)
-  set(GLOD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(GLOD_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      )
  set(GLOD_LIBRARIES glod)
 endif (STANDALONE)
--- a/indra/cmake/GStreamer010Plugin.cmake
+++ b/indra/cmake/GStreamer010Plugin.cmake
@@ -16,10 +16,13 @@ else (STANDALONE)
  set(GSTREAMER010_FOUND ON FORCE BOOL)
  set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
  set(GSTREAMER010_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
-      )
+    ${LIBS_PREBUILT_DIR}/include/gstreamer-0.10
+    ${LIBS_PREBUILT_DIR}/includeg/lib-2.0
+    ${LIBS_PREBUILT_DIR}/include/libxml2
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/gstreamer-0.10
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/glib-2.0
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/libxml2
+    )

 endif (STANDALONE)

--- a/indra/cmake/GoogleBreakpad.cmake
+++ b/indra/cmake/GoogleBreakpad.cmake
@@ -17,5 +17,10 @@ else (STANDALONE)
  endif (WINDOWS)
  # yes, this does look dumb, no, it's not incorrect
  # I think it's incorrect: the second one should go --Aleric
-  set(BREAKPAD_INCLUDE_DIRECTORIES "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/google_breakpad" "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/google_breakpad/google_breakpad")
+  set(BREAKPAD_INCLUDE_DIRECTORIES
+    ${LIBS_PREBUILT_DIR}/include/google_breakpad
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/google_breakpad
+    ${LIBS_PREBUILT_DIR}/include/google_breakpad/google_breakpad
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/google_breakpad/google_breakpad
+    )
 endif (STANDALONE)
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -25,7 +25,9 @@ else (STANDALONE)
      set(TCMALLOC_LIBRARIES tcmalloc_minimal)
    endif()
    set(GOOGLE_PERFTOOLS_INCLUDE_DIR
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      )
  endif (LINUX)
 endif (STANDALONE)

--- a/indra/cmake/Hunspell.cmake
+++ b/indra/cmake/Hunspell.cmake
@@ -6,7 +6,10 @@ if (STANDALONE)
 else (STANDALONE)
    use_prebuilt_binary(hunspell)
 	
-	set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/hunspell)
+	set(HUNSPELL_INCLUDE_DIR
+      ${LIBS_PREBUILT_DIR}/include/hunspell
+      ${LIBS_PREBUILT_LEGACY_DIR}/include/hunspell
+      )

 	if (LINUX OR DARWIN)
 	    set(HUNSPELL_LIBRARY hunspell-1.3)
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -13,11 +13,14 @@ else (STANDALONE)
    set(JPEG_LIBRARIES jpeg)
  elseif (DARWIN)
    set(JPEG_LIBRARIES
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libjpeg.a
+      debug libjpeg.a
+      optimized libjpeg.a
      )
  elseif (WINDOWS)
    set(JPEG_LIBRARIES jpeglib)
  endif (LINUX)
-  set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(JPEG_INCLUDE_DIRS
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
 endif (STANDALONE)
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -24,5 +24,8 @@ else (STANDALONE)
  elseif (LINUX)
    set(JSONCPP_LIBRARIES jsoncpp)
  endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/jsoncpp)
+  set(JSONCPP_INCLUDE_DIR
+    ${LIBS_PREBUILT_DIR}/include/jsoncpp
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/jsoncpp
+    )
 endif (STANDALONE)
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -17,7 +17,10 @@ else (STANDALONE)
    use_prebuilt_binary(mesa)
    use_prebuilt_binary(SDL)
    set (SDL_FOUND TRUE)
-    set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR})
+    set (SDL_INCLUDE_DIR
+      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      )
    if(WORD_SIZE EQUAL 64)
      set (SDL_LIBRARY SDL)
    else(WORD_SIZE EQUAL 64)
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -5,9 +5,18 @@ set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
 include(Variables)

 if (NOT STANDALONE)
-  set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
-  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(ARCH_PREBUILT_DIRS
+    ${LIBS_PREBUILT_DIR}/lib
+    ${LIBS_PREBUILT_LEGACY_DIR}/lib
+    )
+  set(ARCH_PREBUILT_DIRS_RELEASE
+    ${LIBS_PREBUILT_DIR}/lib/release
+    ${LIBS_PREBUILT_LEGACY_DIR}/lib/release
+    )
+  set(ARCH_PREBUILT_DIRS_DEBUG
+    ${LIBS_PREBUILT_DIR}/lib/debug
+    ${LIBS_PREBUILT_LEGACY_DIR}/lib/debug
+    )

  if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
    # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us
@@ -37,7 +46,7 @@ else (LINUX)
  set(PTHREAD_LIBRARY "")
 endif (LINUX)

-if (WINDOWS)
+if (WINDOWS)	
  set(WINDOWS_LIBRARIES
      advapi32
      shell32
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -15,7 +15,10 @@ else (STANDALONE)
    set(NDOF_LIBRARY ndofdev)
  endif (WINDOWS)

-  set(NDOF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ndofdev)
+  set(NDOF_INCLUDE_DIR
+    ${LIBS_PREBUILT_DIR}/include/ndofdev
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/ndofdev
+    )
  set(NDOF_FOUND 1)
 endif (STANDALONE)

--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -21,7 +21,10 @@ if (OPENAL)
    openal
    alut
    )
-    set(OPENAL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    set(OPENAL_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      )
 endif (OPENAL)

 if (OPENAL)
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
@@ -3,5 +3,8 @@ include(Prebuilt)

 if (NOT (STANDALONE OR DARWIN))
  use_prebuilt_binary(glext)
-  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(GLEXT_INCLUDE_DIR
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
 endif (NOT (STANDALONE OR DARWIN))
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -13,7 +13,10 @@ else (STANDALONE OR USE_SYSTEM_OPENSSL)
  else (WINDOWS)
    set(OPENSSL_LIBRARIES ssl)
  endif (WINDOWS)
-  set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(OPENSSL_INCLUDE_DIRS
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
 endif (STANDALONE OR USE_SYSTEM_OPENSSL)

 if (LINUX)
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -34,8 +34,14 @@ else (STANDALONE)
      #
      set(PNG_PRELOAD_ARCHIVES -Wl,--whole-archive png16 -Wl,--no-whole-archive)
      set(PNG_LIBRARIES png16)
-      set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16)
+      set(PNG_INCLUDE_DIRS
+        ${LIBS_PREBUILT_DIR}/include/libpng16
+        ${LIBS_PREBUILT_LEGACY_DIR}/include/libpng16
+        )
    endif ()
  endif()
-  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/)
+  set(PNG_INCLUDE_DIRS
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
 endif (STANDALONE)
--- a/indra/cmake/PulseAudio.cmake
+++ b/indra/cmake/PulseAudio.cmake
@@ -13,8 +13,9 @@ if (PULSEAUDIO)
    use_prebuilt_binary(pulseaudio)
    set(PULSEAUDIO_FOUND ON FORCE BOOL)
    set(PULSEAUDIO_INCLUDE_DIRS
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
-        )
+      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      )
    # We don't need to explicitly link against pulseaudio itself, because
    # the viewer probes for the system's copy at runtime.
    set(PULSEAUDIO_LIBRARIES
--- a/indra/cmake/QuickTimePlugin.cmake
+++ b/indra/cmake/QuickTimePlugin.cmake
@@ -14,13 +14,15 @@ elseif (WINDOWS AND WORD_SIZE EQUAL 32)

  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
               PATHS
-               ${ARCH_PREBUILT_DIRS_DEBUG}
+               ${LIBS_PREBUILT_DIR}/lib/debug
+			   ${LIBS_PREBUILT_LEGACY_DIR}/lib/debug
               "${QUICKTIME_SDK_DIR}\\libraries"
               )

  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
               PATHS
-               ${ARCH_PREBUILT_DIRS_RELEASE}
+               ${LIBS_PREBUILT_DIR}/lib/release
+			   ${LIBS_PREBUILT_LEGACY_DIR}/lib/release
               "${QUICKTIME_SDK_DIR}\\libraries"
               )

@@ -33,7 +35,8 @@ elseif (WINDOWS AND WORD_SIZE EQUAL 32)
  endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
  
  include_directories(
-    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
+    ${LIBS_PREBUILT_DIR}/include/quicktime
+    ${LIBS_PREBUILT_LEGACY_DIR}/include/quicktime
    "${QUICKTIME_SDK_DIR}\\CIncludes"
    )
 endif (DARWIN)
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -55,12 +55,18 @@ else (STANDALONE)
  endif (LINUX)

  include_directories (
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1
+      ${LIBS_PREBUILT_DIR}/packages/include
+      ${LIBS_PREBUILT_DIR}/packages/include/cairo
+      ${LIBS_PREBUILT_DIR}/packages/include/pixman-1
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include/cairo
+      ${LIBS_PREBUILT_LEGACY_DIR}/include/pixman-1
      )
  foreach(include ${${LL_ARCH}_INCLUDES})
-      include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include})
+      include_directories(
+        ${LIBS_PREBUILT_DIR}/include/${include}
+        ${LIBS_PREBUILT_LEGACY_DIR}/include/${include}
+        )
  endforeach(include)
 endif (STANDALONE)

--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -32,9 +32,6 @@ set(DISABLE_TCMALLOC OFF CACHE BOOL "Disable linkage of TCMalloc. (64bit builds
 set(LL_TESTS OFF CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)")
 set(DISABLE_FATAL_WARNINGS TRUE CACHE BOOL "Set this to FALSE to enable fatal warnings.")

-set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH
-    "Location of prebuilt libraries.")
-
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
  set(WINDOWS ON BOOL FORCE)
  if (WORD_SIZE EQUAL 32)
@@ -154,6 +151,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  set(LL_ARCH_DIR universal-darwin)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

+set(LIBS_PREBUILT_DIR ${CMAKE_BINARY_DIR}/packages CACHE PATH
+    "Location of prebuilt libraries.")
+
+set(LIBS_PREBUILT_LEGACY_DIR ${CMAKE_BINARY_DIR}/packages/libraries/${LL_ARCH_DIR} CACHE PATH
+    "Legacy location of prebuilt libraries.")
+
 if (WINDOWS AND WORD_SIZE EQUAL 32)
  set(PREBUILT_TYPE windows)
 elseif (WINDOWS AND WORD_SIZE EQUAL 64)
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -32,8 +32,8 @@ if (WINDOWS)
    )
 elseif (DARWIN)
    set(WEBKIT_PLUGIN_LIBRARIES
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libllqtwebkit.dylib
+        debug libllqtwebkit.dylib
+        optimized libllqtwebkit.dylib
        )
 elseif (LINUX)
     if (STANDALONE)
--- a/indra/cmake/XmlRpcEpi.cmake
+++ b/indra/cmake/XmlRpcEpi.cmake
@@ -9,5 +9,8 @@ if (STANDALONE)
 else (STANDALONE)
    use_prebuilt_binary(xmlrpc-epi)
    set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
-    set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    set(XMLRPCEPI_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      )
 endif (STANDALONE)
--- a/indra/cmake/ZLIB.cmake
+++ b/indra/cmake/ZLIB.cmake
@@ -17,6 +17,9 @@ else (STANDALONE)
    set(ZLIB_LIBRARIES z)
  endif (WINDOWS)
  if (WINDOWS OR LINUX)
-    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib)
+    set(ZLIB_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/include/zlib
+      ${LIBS_PREBUILT_LEGACY_DIR}/include/zlib
+      )
  endif (WINDOWS OR LINUX)
 endif (STANDALONE)