svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme

24 files changed, 77 insertions, 12 deletions

diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index eb1fb68991..b1aec807ee 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -2,6 +2,7 @@
 
 include(BerkeleyDB)
 include(Linking)
+include(Prebuilt)
 
 set(APR_FIND_QUIETLY ON)
 set(APR_FIND_REQUIRED ON)
@@ -12,6 +13,7 @@ set(APRUTIL_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindAPR)
 else (STANDALONE)
+  use_prebuilt_binary(apr_suite)
   if (WINDOWS)
     set(WINLIBS_PREBUILT_DEBUG_DIR 
       ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index 895881141a..c6ccab2613 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -1,4 +1,5 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 if (STANDALONE)
   include(FindPkgConfig)
@@ -7,6 +8,7 @@ if (STANDALONE)
   pkg_check_modules(VORBISENC REQUIRED vorbisenc)
   pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
 else (STANDALONE)
+  use_prebuilt_binary(ogg-vorbis)
   set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
   set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 40f23eb8ca..c7df87177e 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -1,4 +1,5 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 set(Boost_FIND_QUIETLY ON)
 set(Boost_FIND_REQUIRED ON)
@@ -10,6 +11,7 @@ if (STANDALONE)
   set(BOOST_REGEX_LIBRARY boost_regex-mt)
   set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
 else (STANDALONE)
+  use_prebuilt_binary(boost)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 
   if (WINDOWS)
diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake
index 4dfcf588c6..68fabc3493 100644
--- a/indra/cmake/CARes.cmake
+++ b/indra/cmake/CARes.cmake
@@ -1,5 +1,6 @@
 # -*- cmake -*-
 include(Linking)
+include(Prebuilt)
 
 set(CARES_FIND_QUIETLY ON)
 set(CARES_FIND_REQUIRED ON)
@@ -7,6 +8,7 @@ set(CARES_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindCARes)
 else (STANDALONE)
+    use_prebuilt_binary(ares)
     if (WINDOWS)
         set(CARES_LIBRARIES areslib)
     elseif (DARWIN)
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index bce4a85d16..6e5fed4d52 100644
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -1,4 +1,5 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 set(CURL_FIND_QUIETLY ON)
 set(CURL_FIND_REQUIRED ON)
@@ -6,6 +7,7 @@ set(CURL_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindCURL)
 else (STANDALONE)
+  use_prebuilt_binary(curl)
   if (WINDOWS)
     set(CURL_LIBRARIES 
     debug libcurld
diff --git a/indra/cmake/ELFIO.cmake b/indra/cmake/ELFIO.cmake
index 2805842cbc..e420ce27bb 100644
--- a/indra/cmake/ELFIO.cmake
+++ b/indra/cmake/ELFIO.cmake
@@ -1,10 +1,12 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 set(ELFIO_FIND_QUIETLY ON)
 
 if (STANDALONE)
   include(FindELFIO)
 elseif (LINUX)
+  use_prebuilt_binary(elfio)
   set(ELFIO_LIBRARIES ELFIO)
   set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)
diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake
index 3010d63532..acb15dc623 100644
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
@@ -1,4 +1,5 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 set(EXPAT_FIND_QUIETLY ON)
 set(EXPAT_FIND_REQUIRED ON)
@@ -6,6 +7,7 @@ set(EXPAT_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindEXPAT)
 else (STANDALONE)
+    use_prebuilt_binary(expat)
     if (WINDOWS)
         set(EXPAT_LIBRARIES libexpatMT)
     else (WINDOWS)
diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake
index 781c8babbe..258fd6bf66 100644
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -1,4 +1,7 @@
 # -*- cmake -*-
+include(Prebuilt)
+
+use_prebuilt_binary(fmod)
 
 find_library(FMOD_LIBRARY
              NAMES fmod fmodvc fmod-3.75
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index 064135bcd1..5f1aa26e89 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -1,10 +1,12 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 if (STANDALONE)
   include(FindPkgConfig)
 
   pkg_check_modules(FREETYPE REQUIRED freetype2)
 else (STANDALONE)
+  use_prebuilt_binary(freetype)
   if (LINUX)
     set(FREETYPE_INCLUDE_DIRS
         ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 61a2631a08..9b3eca060f 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -1,8 +1,10 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
+  use_prebuilt_binary(google)
   if (LINUX)
     set(TCMALLOC_LIBRARIES tcmalloc)
     set(STACKTRACE_LIBRARIES stacktrace)
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 18bdd8bc46..8047718f39 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -1,4 +1,5 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 include(Linking)
 set(JPEG_FIND_QUIETLY ON)
@@ -7,6 +8,7 @@ set(JPEG_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindJPEG)
 else (STANDALONE)
+  use_prebuilt_binary(jpeglib)
   if (LINUX)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index 6ec14d2588..a02b5d958e 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -1,6 +1,8 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
+  use_prebuilt_binary(kdu)
   if (WINDOWS)
     set(KDU_LIBRARY debug kdu_cored optimized kdu_core)
   elseif (LINUX)
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index 7a1ecaf0b1..c0efa27f6e 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -1,6 +1,7 @@
 # -*- cmake -*-
 
 include(OpenGL)
+include(Prebuilt)
 
 if (STANDALONE)
   include(FindSDL)
@@ -12,6 +13,8 @@ if (STANDALONE)
       SDL_LIBRARY
       )
 else (STANDALONE)
+  use_prebuilt_binary(SDL)
+  use_prebuilt_binary(mesa)
   if (LINUX AND VIEWER)
     set (SDL_FOUND TRUE)
     set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux)
diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake
index 7dc638ec57..e7400a3de4 100644
--- a/indra/cmake/MySQL.cmake
+++ b/indra/cmake/MySQL.cmake
@@ -1,7 +1,10 @@
 # -*- cmake -*-
 include(Linking)
+include(Prebuilt)
 # We don't prebuild our own MySQL client library.
 
+use_prebuilt_binary(mysql)
+
 set(MYSQL_FIND_QUIETLY ON)
 set(MYSQL_FIND_REQUIRED ON)
 
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index 22e9787653..3f715a2312 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -1,4 +1,7 @@
 # -*- cmake -*-
+include(Prebuilt)
+
+use_prebuilt_binary(ndofdev)
 
 if (WINDOWS OR DARWIN)
   add_definitions(-DLIB_NDOF=1)
diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake
index 7395d478fe..6a2b6811af 100644
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
@@ -1,5 +1,9 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 if (NOT STANDALONE)
+  use_prebuilt_binary(GL)
+  # possible glh_linear should have its own .cmake file instead
+  use_prebuilt_binary(glh_linear)
   set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-endif (NOT STANDALONE)
\ No newline at end of file
+endif (NOT STANDALONE)
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index 32dcb505aa..fcc82c2f49 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -1,4 +1,5 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 set(OPENJPEG_FIND_QUIETLY ON)
 set(OPENJPEG_FIND_REQUIRED ON)
@@ -6,6 +7,7 @@ set(OPENJPEG_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindOpenJPEG)
 else (STANDALONE)
+  use_prebuilt_binary(openjpeg)
   
   if(WINDOWS)
     # Windows has differently named release and debug openjpeg(d) libs.
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 715af3ba54..81584c09ea 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -1,4 +1,5 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 set(OpenSSL_FIND_QUIETLY ON)
 set(OpenSSL_FIND_REQUIRED ON)
@@ -6,6 +7,7 @@ set(OpenSSL_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindOpenSSL)
 else (STANDALONE)
+  use_prebuilt_binary(openSSL)
   if (WINDOWS)
     set(OPENSSL_LIBRARIES ssleay32 libeay32)
   else (WINDOWS)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index b4f7e5e66b..4d0b7b2d8d 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -1,4 +1,5 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 set(PNG_FIND_QUIETLY ON)
 set(PNG_FIND_REQUIRED ON)
@@ -6,6 +7,7 @@ set(PNG_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindPNG)
 else (STANDALONE)
+  use_prebuilt_binary(libpng)
   set(PNG_LIBRARIES png12)
   set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index 2f4fbd05c7..33cdeeeed5 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -2,16 +2,19 @@
 
 include(Python)
 
-macro (use_prebuilt_library _lib)
+macro (use_prebuilt_binary _binary)
   if (NOT STANDALONE)
-    exec_program(${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}
-                 ARGS
-                 --install-dir=${LIBS_PREBUILT_DIR} ${_lib}/${ARCH}
-                 RETURN_VALUE _installed
-                 )
-    if (NOT _installed)
+    execute_process(COMMAND ${PYTHON_EXECUTABLE}
+                    install.py 
+                    --install-dir=${CMAKE_SOURCE_DIR}/..
+                    ${_binary}
+                    WORKING_DIRECTORY ${SCRIPTS_DIR}
+                    RESULT_VARIABLE _installed
+                    )
+    if (NOT _installed EQUAL 0)
       message(FATAL_ERROR
-              "Failed to download or unpack prebuilt ${_lib} for ${ARCH}")
-    endif (NOT _installed)
+              "Failed to download or unpack prebuilt '${_binary}'."
+              " Process returned ${_installed}.")
+    endif (NOT _installed EQUAL 0)
   endif (NOT STANDALONE)
-endmacro (use_prebuilt_library _lib)
+endmacro (use_prebuilt_binary _binary)
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 7d2955ce36..f529f5b644 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -1,4 +1,5 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 if (STANDALONE)
   include(FindPkgConfig)
@@ -30,6 +31,7 @@ if (STANDALONE)
     add_definitions(${${pkg}_CFLAGS_OTHERS})
   endforeach(pkg)
 else (STANDALONE)
+  use_prebuilt_binary(gtk-atk-pango-glib)
   if (LINUX)
     set(UI_LIBRARIES
         atk-1.0
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
new file mode 100644
index 0000000000..7329972596
--- /dev/null
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (NOT STANDALONE)
+  use_prebuilt_binary(libstdc++)
+  use_prebuilt_binary(libuuid)
+  use_prebuilt_binary(vivox)
+endif(NOT STANDALONE)
+
diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake
index 3fd6f80eb9..107d1926ba 100644
--- a/indra/cmake/XmlRpcEpi.cmake
+++ b/indra/cmake/XmlRpcEpi.cmake
@@ -1,4 +1,5 @@
 # -*- cmake -*-
+include(Prebuilt)
 
 set(XMLRPCEPI_FIND_QUIETLY ON)
 set(XMLRPCEPI_FIND_REQUIRED ON)
@@ -6,6 +7,7 @@ set(XMLRPCEPI_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindXmlRpcEpi)
 else (STANDALONE)
+    use_prebuilt_binary(xmlrpc-epi)
     if (WINDOWS)
         set(XMLRPCEPI_LIBRARIES xmlrpcepi)
     else (WINDOWS)
diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake
index 3740103a72..80d4191971 100644
--- a/indra/cmake/ZLIB.cmake
+++ b/indra/cmake/ZLIB.cmake
@@ -3,13 +3,18 @@
 set(ZLIB_FIND_QUIETLY ON)
 set(ZLIB_FIND_REQUIRED ON)
 
+include(Prebuilt)
+
 if (STANDALONE)
   include(FindZLIB)
 else (STANDALONE)
+  use_prebuilt_binary(zlib)
   if (WINDOWS)
     set(ZLIB_LIBRARIES zlib)
   else (WINDOWS)
     set(ZLIB_LIBRARIES z)
   endif (WINDOWS)
-  set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  if (WINDOWS OR LINUX)
+    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib)
+  endif (WINDOWS OR LINUX)
 endif (STANDALONE)