From 2230b52145ba7b22bea4b365b010016e62c25b58 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Tue, 11 Jan 2011 16:07:14 -0800
Subject: remove develop.py and references to it (use autobuild instead)

---
 indra/cmake/CMakeLists.txt | 1 -
 indra/cmake/LLKDU.cmake    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 3f421b270b..3c7ae50df1 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -85,7 +85,6 @@ source_group("Shared Rules" FILES ${cmake_SOURCE_FILES})
 
 set(master_SOURCE_FILES
     ../CMakeLists.txt
-    ../develop.py
     )
 
 if (SERVER)
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index f5cbad03a6..3a6e746605 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-# USE_KDU can be set when launching cmake or develop.py as an option using the argument -DUSE_KDU:BOOL=ON
+# USE_KDU can be set when launching cmake as an option using the argument -DUSE_KDU:BOOL=ON
 # When building using proprietary binaries though (i.e. having access to LL private servers), we always build with KDU
 if (INSTALL_PROPRIETARY AND NOT STANDALONE)
   set(USE_KDU ON)
-- 
cgit v1.2.3


From b7637e58bef73abfced2721d6b697e47b2d9f622 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 13 Jan 2011 13:09:27 -0800
Subject: mac buiding with autobuild and autobuild style packages (just say no
 to install.py)

---
 indra/cmake/APR.cmake                | 12 ++-----
 indra/cmake/Copy3rdPartyLibs.cmake   |  9 ++---
 indra/cmake/DBusGlib.cmake           |  2 +-
 indra/cmake/FindAutobuild.cmake      | 41 ++++++++++++++++++++++
 indra/cmake/FreeType.cmake           |  2 +-
 indra/cmake/GStreamer010Plugin.cmake |  6 ++--
 indra/cmake/GooglePerfTools.cmake    |  6 ++--
 indra/cmake/Linking.cmake            | 51 ++++++++++++++++-----------
 indra/cmake/MonoEmbed.cmake          |  4 +--
 indra/cmake/MySQL.cmake              |  6 ++--
 indra/cmake/OpenGL.cmake             |  2 +-
 indra/cmake/OpenSSL.cmake            |  2 +-
 indra/cmake/Prebuilt.cmake           | 42 ++++++++++++++--------
 indra/cmake/QuickTimePlugin.cmake    |  2 +-
 indra/cmake/UI.cmake                 |  4 +--
 indra/cmake/Variables.cmake          | 68 ++++++++++++++++++++----------------
 16 files changed, 162 insertions(+), 97 deletions(-)
 create mode 100644 indra/cmake/FindAutobuild.cmake

(limited to 'indra/cmake')

diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 180504d286..5b31b0d237 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -38,21 +38,15 @@ else (STANDALONE)
       set(APR_selector     "a")
       set(APRUTIL_selector "a")
     endif (LLCOMMON_LINK_SHARED)
-    set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.${APR_selector}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.${APR_selector}
-      )
-    set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.${APRUTIL_selector}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.${APRUTIL_selector}
-      )
+    set(APR_LIBRARIES libapr-1.${APR_selector})
+    set(APRUTIL_LIBRARIES libaprutil-1.${APRUTIL_selector})
     set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)
     set(APR_LIBRARIES apr-1)
     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)
 
   if (LINUX)
     if (VIEWER)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 176ae9787e..55a26cf9ef 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -5,6 +5,7 @@
 # VisualStudio.
 
 include(CMakeCopyIfDifferent)
+include(Linking)
 
 ###################################################################
 # set up platform specific lists of files that need to be copied
@@ -135,14 +136,10 @@ elseif(DARWIN)
         libvivoxplatform.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_src_dir "${ARCH_PREBUILT_DIRS_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_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
         libapr-1.0.3.7.dylib
         libapr-1.dylib
diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake
index cfc4ccd404..33c6343a93 100644
--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
@@ -10,7 +10,7 @@ elseif (LINUX)
   use_prebuilt_binary(dbusglib)
   set(DBUSGLIB_FOUND ON FORCE BOOL)
   set(DBUSGLIB_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+      ${LIBS_PREBUILT_DIR}/include/glib-2.0
       )
   # We don't need to explicitly link against dbus-glib itself, because
   # the viewer probes for the system's copy at runtime.
diff --git a/indra/cmake/FindAutobuild.cmake b/indra/cmake/FindAutobuild.cmake
new file mode 100644
index 0000000000..45db2b6ed0
--- /dev/null
+++ b/indra/cmake/FindAutobuild.cmake
@@ -0,0 +1,41 @@
+# -*- cmake -*-
+#
+# Find the autobuild tool
+#
+# Output variables:
+#
+#   AUTOBUILD_EXECUTABLE - path to autobuild or pautobuild executable
+
+# *TODO - if cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var
+# update this to check for that case
+
+IF (NOT AUTOBUILD_EXECUTABLE)
+    IF(WIN32)
+      SET(AUTOBUILD_EXE_NAMES autobuild.cmd autobuild.exe)
+    ELSE(WIN32)
+      SET(AUTOBUILD_EXE_NAMES autobuild)
+    ENDIF(WIN32)
+
+    SET(AUTOBUILD_EXECUTABLE)
+    FIND_PROGRAM(
+      AUTOBUILD_EXECUTABLE 
+      NAMES ${AUTOBUILD_EXE_NAMES}
+      PATHS 
+	ENV PATH
+	${CMAKE_SOURCE_DIR}/.. 
+	${CMAKE_SOURCE_DIR}/../..
+	${CMAKE_SOURCE_DIR}/../../..
+      PATH_SUFFIXES "/autobuild/bin/"
+    )
+
+    IF (AUTOBUILD_EXECUTABLE)
+      GET_FILENAME_COMPONENT(_autobuild_name ${AUTOBUILD_EXECUTABLE} NAME_WE)
+      MESSAGE(STATUS "Using autobuild at: ${AUTOBUILD_EXECUTABLE}")
+    ELSE (AUTOBUILD_EXECUTABLE)
+      IF (AUTOBUILD_FIND_REQUIRED)
+	MESSAGE(FATAL_ERROR "Could not find autobuild executable")
+      ENDIF (AUTOBUILD_FIND_REQUIRED)
+    ENDIF (AUTOBUILD_EXECUTABLE)
+
+    MARK_AS_ADVANCED(AUTOBUILD_EXECUTABLE)
+ENDIF (NOT AUTOBUILD_EXECUTABLE)
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index 5f1aa26e89..43a9d282d0 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -9,7 +9,7 @@ else (STANDALONE)
   use_prebuilt_binary(freetype)
   if (LINUX)
     set(FREETYPE_INCLUDE_DIRS
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+        ${LIBS_PREBUILT_DIR}/include)
   else (LINUX)
     set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   endif (LINUX)
diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake
index 0ca432da18..d2d0699bcd 100644
--- a/indra/cmake/GStreamer010Plugin.cmake
+++ b/indra/cmake/GStreamer010Plugin.cmake
@@ -13,9 +13,9 @@ elseif (LINUX)
   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}/include/glib-2.0
+      ${LIBS_PREBUILT_DIR}/include/libxml2
       )
   # We don't need to explicitly link against gstreamer itself, because
   # LLMediaImplGStreamer probes for the system's copy at runtime.
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 946fc6b375..0ac67fe595 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -4,7 +4,9 @@ include(Prebuilt)
 if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
-  use_prebuilt_binary(google)
+  if(NOT DARWIN)
+    use_prebuilt_binary(google)
+  endif()
   if (WINDOWS)
     use_prebuilt_binary(google-perftools)
     set(TCMALLOC_LIBRARIES 
@@ -17,7 +19,7 @@ else (STANDALONE)
     set(STACKTRACE_LIBRARIES stacktrace)
     set(PROFILER_LIBRARIES profiler)
     set(GOOGLE_PERFTOOLS_INCLUDE_DIR
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+        ${LIBS_PREBUILT_DIR}/include)
     set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (LINUX)
 endif (STANDALONE)
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index bca99caf2a..07db6ab257 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -1,32 +1,43 @@
 # -*- cmake -*-
 
+include(Variables)
+
+
 if (NOT STANDALONE)
+  set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib)
+  set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release)
+  set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug)
   if (WINDOWS)
-    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(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")
+    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
+    set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
   elseif (LINUX)
-    if (VIEWER)
-      set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client)
-    else (VIEWER)
-      set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
-    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/lib CACHE FILEPATH "Location of staged .sos")
-    set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin CACHE FILEPATH "Location of staged executables")
+    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib)
+    set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin)
   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")
+    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
+    set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs/\$(CONFIGURATION)")
   endif (WINDOWS)
 endif (NOT STANDALONE)
 
-link_directories(${ARCH_PREBUILT_DIRS})
+# Autobuild packages must provide 'release' versions of libraries, but may provide versions for
+# specific build types.  AUTOBUILD_LIBS_INSTALL_DIRS lists first the build type directory and then
+# the 'release' directory (as a default fallback).
+# *NOTE - we have to take special care to use CMAKE_CFG_INTDIR on IDE generators (like mac and
+# windows) and CMAKE_BUILD_TYPE on Makefile based generators (like linux).  The reason for this is
+# that CMAKE_BUILD_TYPE is essentially meaningless at configuration time for IDE generators and
+# CMAKE_CFG_INTDIR is meaningless at build time for Makefile generators
+if(WINDOWS OR DARWIN)
+  # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us
+  # fortunately both windows and darwin are case insensitive filesystems so this works.
+  set(AUTOBUILD_LIBS_INSTALL_DIRS "${AUTOBUILD_INSTALL_DIR}/lib/")
+else(WINDOWS OR DARWIN)
+  # else block is for linux and any other makefile based generators
+  string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
+  set(AUTOBUILD_LIBS_INSTALL_DIRS ${AUTOBUILD_INSTALL_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER})
+endif(WINDOWS OR DARWIN)
+
+list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
+link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS})
 
 if (LINUX)
   set(DL_LIBRARY dl)
diff --git a/indra/cmake/MonoEmbed.cmake b/indra/cmake/MonoEmbed.cmake
index 0f1f23309c..30890aed21 100644
--- a/indra/cmake/MonoEmbed.cmake
+++ b/indra/cmake/MonoEmbed.cmake
@@ -37,9 +37,9 @@ IF (DARWIN)
 
 ELSE (DARWIN)
 
-  SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)  
+  SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)  
   SET(GLIB_2_0_PLATFORM_INCLUDE_DIR
-    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0)
+    ${LIBS_PREBUILT_DIR}/include/glib-2.0)
   SET(GLIB_2_0_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/glib-2.0)
 
   INCLUDE_DIRECTORIES(
diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake
index e591fbc3d8..218482449d 100644
--- a/indra/cmake/MySQL.cmake
+++ b/indra/cmake/MySQL.cmake
@@ -7,7 +7,7 @@ use_prebuilt_binary(mysql)
 if (LINUX)
   if (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1")
     set(MYSQL_LIBRARIES mysqlclient)
-    set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
   else (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1")
     # Use the native MySQL library on a 64-bit system.
     set(MYSQL_FIND_QUIETLY ON)
@@ -16,9 +16,9 @@ if (LINUX)
   endif (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1")
 elseif (WINDOWS)
   set(MYSQL_LIBRARIES mysqlclient)
-  set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
 elseif (DARWIN)
-  set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
   set(MYSQL_LIBRARIES
     optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a
     debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a
diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake
index 6a2b6811af..661666f00d 100644
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
@@ -5,5 +5,5 @@ 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)
+  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
 endif (NOT STANDALONE)
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 81584c09ea..c692b67b49 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -13,7 +13,7 @@ else (STANDALONE)
   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)
 endif (STANDALONE)
 
 if (LINUX)
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index a91519278c..9b758b03f0 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -1,33 +1,45 @@
 # -*- cmake -*-
 
-include(Python)
-include(FindSCP)
+include(FindAutobuild)
 
 macro (use_prebuilt_binary _binary)
-  if (NOT STANDALONE)
+  if (NOT DEFINED STANDALONE_${_binary})
+    set(STANDALONE_${_binary} ${STANDALONE})
+  endif (NOT DEFINED STANDALONE_${_binary})
+
+  if (NOT STANDALONE_${_binary})
     if(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed)
       if(INSTALL_PROPRIETARY)
         include(FindSCP)
         if(DEBUG_PREBUILT)
-          message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. --scp=${SCP_EXECUTABLE} ${_binary}")
+          message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install
+          --install-dir=${AUTOBUILD_INSTALL_DIR}
+          #--scp="${SCP_EXECUTABLE}"
+          --skip-license-check
+          ${_binary} ")
         endif(DEBUG_PREBUILT)
-        execute_process(COMMAND ${PYTHON_EXECUTABLE}
-          install.py 
-          --install-dir=${CMAKE_SOURCE_DIR}/..
-          --scp=${SCP_EXECUTABLE}
+        execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
+          install
+          --install-dir=${AUTOBUILD_INSTALL_DIR}
+          #--scp="${SCP_EXECUTABLE}"
+          --skip-license-check
           ${_binary}
-          WORKING_DIRECTORY ${SCRIPTS_DIR}
+          WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
           RESULT_VARIABLE ${_binary}_installed
           )
       else(INSTALL_PROPRIETARY)
         if(DEBUG_PREBUILT)
-          message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. ${_binary}")
+          message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install
+          --install-dir=${AUTOBUILD_INSTALL_DIR}
+          --skip-license-check
+          ${_binary} ")
         endif(DEBUG_PREBUILT)
-        execute_process(COMMAND ${PYTHON_EXECUTABLE}
-          install.py 
-          --install-dir=${CMAKE_SOURCE_DIR}/..
+        execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
+          install
+          --install-dir=${AUTOBUILD_INSTALL_DIR}
+          --skip-license-check
           ${_binary}
-          WORKING_DIRECTORY ${SCRIPTS_DIR}
+          WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
           RESULT_VARIABLE ${_binary}_installed
           )
       endif(INSTALL_PROPRIETARY)
@@ -40,5 +52,5 @@ macro (use_prebuilt_binary _binary)
               "Failed to download or unpack prebuilt '${_binary}'."
               " Process returned ${${_binary}_installed}.")
     endif (NOT ${_binary}_installed EQUAL 0)
-  endif (NOT STANDALONE)
+  endif (NOT STANDALONE_${_binary})
 endmacro (use_prebuilt_binary _binary)
diff --git a/indra/cmake/QuickTimePlugin.cmake b/indra/cmake/QuickTimePlugin.cmake
index 02f432e3c1..012f4e20d8 100644
--- a/indra/cmake/QuickTimePlugin.cmake
+++ b/indra/cmake/QuickTimePlugin.cmake
@@ -33,7 +33,7 @@ elseif (WINDOWS)
   endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
   
   include_directories(
-    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
+    ${LIBS_PREBUILT_DIR}/include/quicktime
     "${QUICKTIME_SDK_DIR}\\CIncludes"
     )
 endif (DARWIN)
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index f529f5b644..91e5258fb7 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -51,11 +51,11 @@ else (STANDALONE)
   endif (LINUX)
 
   include_directories (
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
+      ${LIBS_PREBUILT_DIR}/include
       ${LIBS_PREBUILT_DIR}/include
       )
   foreach(include ${${LL_ARCH}_INCLUDES})
-      include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include})
+      include_directories(${LIBS_PREBUILT_DIR}/include/${include})
   endforeach(include)
 endif (STANDALONE)
 
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 5dc0cabf03..88cfdfc0b9 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -17,6 +17,10 @@
 
 # Relative and absolute paths to subtrees.
 
+if(NOT DEFINED COMMON_CMAKE_DIR)
+    set(COMMON_CMAKE_DIR "${CMAKE_SOURCE_DIR}/cmake")
+endif(NOT DEFINED COMMON_CMAKE_DIR)
+
 set(LIBS_CLOSED_PREFIX)
 set(LIBS_OPEN_PREFIX)
 set(LIBS_SERVER_PREFIX)
@@ -26,14 +30,26 @@ set(VIEWER_PREFIX)
 set(INTEGRATION_TESTS_PREFIX)
 set(LL_TESTS ON CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation")
 
-set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
-set(LIBS_OPEN_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
+if(LIBS_CLOSED_DIR)
+  file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
+else(LIBS_CLOSED_DIR)
+  set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
+endif(LIBS_CLOSED_DIR)
+if(LIBS_COMMON_DIR)
+  file(TO_CMAKE_PATH "${LIBS_COMMON_DIR}" LIBS_COMMON_DIR)
+else(LIBS_COMMON_DIR)
+  set(LIBS_COMMON_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
+endif(LIBS_COMMON_DIR)
+set(LIBS_OPEN_DIR ${LIBS_COMMON_DIR})
+
 set(LIBS_SERVER_DIR ${CMAKE_SOURCE_DIR}/${LIBS_SERVER_PREFIX})
 set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX})
 set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX})
 set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX})
 
-set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH
+set(AUTOBUILD_INSTALL_DIR ${CMAKE_BINARY_DIR}/packages)
+
+set(LIBS_PREBUILT_DIR ${AUTOBUILD_INSTALL_DIR} CACHE PATH
     "Location of prebuilt libraries.")
 
 if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
@@ -41,6 +57,10 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
   set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries")
 endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
 
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+      "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
+endif (NOT CMAKE_BUILD_TYPE)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
   set(WINDOWS ON BOOL FORCE)
@@ -54,20 +74,19 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(LINUX ON BOOl FORCE)
 
   # If someone has specified a word size, use that to determine the
-  # architecture.  Otherwise, let the compiler specify the word size.
-  # Using uname will break under chroots and other cross arch compiles. RC
+  # architecture.  Otherwise, let the architecture specify the word size.
   if (WORD_SIZE EQUAL 32)
     set(ARCH i686)
   elseif (WORD_SIZE EQUAL 64)
     set(ARCH x86_64)
   else (WORD_SIZE EQUAL 32)
-    if(CMAKE_SIZEOF_VOID_P MATCHES 4)
-      set(ARCH i686)
-      set(WORD_SIZE 32)
-    else(CMAKE_SIZEOF_VOID_P MATCHES 4)
-      set(ARCH x86_64)
+    execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/
+                    OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (ARCH STREQUAL x86_64)
       set(WORD_SIZE 64)
-    endif(CMAKE_SIZEOF_VOID_P MATCHES 4)
+    else (ARCH STREQUAL x86_64)
+      set(WORD_SIZE 32)
+    endif (ARCH STREQUAL x86_64)
   endif (WORD_SIZE EQUAL 32)
 
   set(LL_ARCH ${ARCH}_linux)
@@ -76,25 +95,12 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
-
-  # NOTE: If specifying a different SDK with CMAKE_OSX_SYSROOT at configure
-  # time you should also specify CMAKE_OSX_DEPLOYMENT_TARGET explicitly,
-  # otherwise CMAKE_OSX_SYSROOT will be overridden here. We can't just check
-  # for it being unset, as it gets set to the system default :(
-
-  # Default to building against the 10.4 SDK if no deployment target is
-  # specified.
-  if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-    # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html
-    # see http://public.kitware.com/Bug/view.php?id=9959 + poppy
-    set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4)
-  endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-
-  # GCC 4.2 is incompatible with the MacOSX 10.4 SDK
-  if (${CMAKE_OSX_SYSROOT} MATCHES "10.4u")
-    set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0")
-  endif (${CMAKE_OSX_SYSROOT} MATCHES "10.4u")
+  
+  # To support a different SDK update these Xcode settings:
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
+  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.2")
+  set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "DWARF with dSYM File")
 
   # NOTE: To attempt an i386/PPC Universal build, add this on the configure line:
   # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
@@ -125,6 +131,7 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
 set(VIEWER_CHANNEL "LindenDeveloper" CACHE STRING "Viewer Channel Name")
 set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
 
+set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
 set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
 
 if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
@@ -144,3 +151,4 @@ endif (LINUX AND SERVER AND VIEWER)
 set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.")
 
 source_group("CMake Rules" FILES CMakeLists.txt)
+
-- 
cgit v1.2.3


From 738c7546087b5c5fa049be0563623221ef5716c6 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Fri, 14 Jan 2011 09:03:22 -0800
Subject: windows autobuildibatized (bye bye install.py...)

---
 indra/cmake/Copy3rdPartyLibs.cmake | 11 ++++-------
 indra/cmake/GooglePerfTools.cmake  |  4 +---
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 55a26cf9ef..92ebd75006 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -17,7 +17,7 @@ if(WINDOWS)
 
     #*******************************
     # VIVOX - *NOTE: no debug version
-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         SLVoice.exe
         libsndfile-1.dll
@@ -31,9 +31,7 @@ if(WINDOWS)
     #*******************************
     # 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_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
     set(debug_files
         openjpegd.dll
         libapr-1.dll
@@ -41,14 +39,13 @@ if(WINDOWS)
         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_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
         openjpeg.dll
         libapr-1.dll
         libaprutil-1.dll
         libapriconv-1.dll
+        dbghelp.dll
         )
 
     if(USE_GOOGLE_PERFTOOLS)
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 0ac67fe595..133ae14d2f 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -4,9 +4,6 @@ include(Prebuilt)
 if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
-  if(NOT DARWIN)
-    use_prebuilt_binary(google)
-  endif()
   if (WINDOWS)
     use_prebuilt_binary(google-perftools)
     set(TCMALLOC_LIBRARIES 
@@ -15,6 +12,7 @@ else (STANDALONE)
     set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (WINDOWS)
   if (LINUX)
+    use_prebuilt_binary(google)
     set(TCMALLOC_LIBRARIES tcmalloc)
     set(STACKTRACE_LIBRARIES stacktrace)
     set(PROFILER_LIBRARIES profiler)
-- 
cgit v1.2.3


From 3150fb0021222fe5e39dd45e82c183ccff8013f0 Mon Sep 17 00:00:00 2001
From: jenn <jenn@lindenlab.com>
Date: Tue, 18 Jan 2011 09:59:34 -0800
Subject: Added entries to autobuild.xml for 'openal_soft' and 'google' libs on
 linux. These packages have been rebuilt to use the new package layout (thanks
 alain!). 'openal_soft' was also renamed to use an underscore in its name
 rather than a dash.

---
 indra/cmake/OPENAL.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index d01c680ed1..ed483e5aea 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -15,7 +15,7 @@ if (OPENAL)
     pkg_check_modules(OPENAL_LIB REQUIRED openal)
     pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
   else (STANDALONE)
-    use_prebuilt_binary(openal-soft)
+    use_prebuilt_binary(openal_soft)
   endif (STANDALONE)
   set(OPENAL_LIBRARIES 
     openal
-- 
cgit v1.2.3


From 86acdedc63951705eb718480f060f3c8fc779b34 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Tue, 18 Jan 2011 13:18:04 -0800
Subject: fix path to prebiuld slvoice libraries on mac and linux.

---
 indra/cmake/Copy3rdPartyLibs.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 92ebd75006..2e8bb04db1 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -124,7 +124,7 @@ elseif(DARWIN)
     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_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         SLVoice
         libsndfile.dylib
@@ -159,7 +159,7 @@ elseif(LINUX)
     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_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         libsndfile.so.1
         libortp.so
-- 
cgit v1.2.3


From 19293991b708b90bbe75c86f7a6b0861d741b57a Mon Sep 17 00:00:00 2001
From: jenn <jenn@lindenlab.com>
Date: Tue, 18 Jan 2011 16:27:18 -0800
Subject: Added 'slvoice' (vivox) to autobuild.xml for linux. This is version
 3.1 of the lib; viewer was using version 3.2, but this version has been
 rebuilt using the new package layout. Hopefully it will work, though we may
 need to convert version 3.2 if it does not.

Updated Copy3rdParyLibs.cmake paths for linux installation of vivox files.
---
 indra/cmake/Copy3rdPartyLibs.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 2e8bb04db1..9741d4f890 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -155,9 +155,9 @@ elseif(DARWIN)
 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_DEBUG            "${SHARED_LIB_STAGING_DIR}/debug")
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
-    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
+    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/release")
 
     set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
-- 
cgit v1.2.3


From 0d6ec39f44f9f32060bb5d02ad9281922a610516 Mon Sep 17 00:00:00 2001
From: jenn <jenn@lindenlab.com>
Date: Wed, 19 Jan 2011 10:03:51 -0800
Subject: Cmake updates to get llkdu building on linux. Need to rebuild kdu
 tarball next.

---
 indra/cmake/Copy3rdPartyLibs.cmake | 8 ++++----
 indra/cmake/LLKDU.cmake            | 2 +-
 indra/cmake/run_build_test.py      | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 indra/cmake/run_build_test.py

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 9741d4f890..3d49f97a2a 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -155,9 +155,9 @@ elseif(DARWIN)
 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}/debug")
+    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}/release")
+    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
 
     set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
@@ -170,12 +170,12 @@ elseif(LINUX)
        )
     # *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_src_dir "${ARCH_PREBUILT_DIRS_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")
+    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     # *FIX - figure out what to do with duplicate libalut.so here -brad
     set(release_files
         libapr-1.so.0
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index 3a6e746605..bbbb2df366 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -14,7 +14,7 @@ if (USE_KDU)
   else (WINDOWS)
     set(KDU_LIBRARY libkdu.a)
   endif (WINDOWS)
-  set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/kdu)
+  set(KDU_INCLUDE_DIR ${ARCH_PREBUILT_DIRS_RELEASE}/include/kdu)
   set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu)
   set(LLKDU_LIBRARIES llkdu)
 endif (USE_KDU)
diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 6bd044720e41587eb58c07b225ae82862b69dd4f Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Wed, 19 Jan 2011 14:15:24 -0800
Subject: fix include path for KDU headers

---
 indra/cmake/LLKDU.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index bbbb2df366..13c2b86e2f 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -14,7 +14,7 @@ if (USE_KDU)
   else (WINDOWS)
     set(KDU_LIBRARY libkdu.a)
   endif (WINDOWS)
-  set(KDU_INCLUDE_DIR ${ARCH_PREBUILT_DIRS_RELEASE}/include/kdu)
+  set(KDU_INCLUDE_DIR ${AUTOBUILD_INSTALL_DIR}/include/kdu)
   set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu)
   set(LLKDU_LIBRARIES llkdu)
 endif (USE_KDU)
-- 
cgit v1.2.3


From 60f831151e41ccec184c4c6ecace86491fca36da Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Thu, 20 Jan 2011 11:03:53 -0800
Subject: Compile flag for wchar_t, boost 1_45 lib update, indra.l include
 ordering adjustment

---
 indra/cmake/00-Common.cmake |  4 ++--
 indra/cmake/Boost.cmake     | 36 +++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 21 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index dbe0cf5cd0..25a1b05d8e 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -61,7 +61,7 @@ if (WINDOWS)
       /Oy-
       )
      
-  if(MSVC80 OR MSVC90)
+  if(MSVC)
     set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
       CACHE STRING "C++ compiler release options" FORCE)
@@ -69,7 +69,7 @@ if (WINDOWS)
     add_definitions(
       /Zc:wchar_t-
       )
-  endif (MSVC80 OR MSVC90)
+  endif (MSVC)
   
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT VS_DISABLE_FATAL_WARNINGS)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 012d3c2ab2..0b7eb7e99b 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -17,24 +17,8 @@ else (STANDALONE)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 
   if (WINDOWS)
-    set(BOOST_VERSION 1_39)
-    if (MSVC71)
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION})
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION})
-      set(BOOST_SYSTEM_LIBRARY 
-          optimized libboost_system-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_system-vc71-mt-sgd-${BOOST_VERSION})
-      set(BOOST_FILESYSTEM_LIBRARY 
-          optimized libboost_filesystem-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_filesystem-vc71-mt-sgd-${BOOST_VERSION})
-    else (MSVC71)
+    set(BOOST_VERSION 1_45)
+    if(MSVC80)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
           debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
@@ -50,7 +34,21 @@ else (STANDALONE)
       set(BOOST_FILESYSTEM_LIBRARY 
           optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
           debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
-    endif (MSVC71)
+    else(MSVC80)
+      # MSVC 10.0 config
+      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
+          optimized libboost_program_options-vc100-mt
+          debug libboost_program_options-vc100-mt-gd)
+      set(BOOST_REGEX_LIBRARY
+          optimized libboost_regex-vc100-mt
+          debug libboost_regex-vc100-mt-gd)
+      set(BOOST_SYSTEM_LIBRARY 
+          optimized libboost_system-vc100-mt
+          debug libboost_system-vc100-mt-gd)
+      set(BOOST_FILESYSTEM_LIBRARY 
+          optimized libboost_filesystem-vc100-mt
+          debug libboost_filesystem-vc100-mt-gd)    
+    endif (MSVC80)
   elseif (DARWIN)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt)
-- 
cgit v1.2.3


From 6dd086794f5cf319fca1736a5803423b58d79d0b Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Mon, 24 Jan 2011 12:04:49 -0800
Subject: Updated boost lib

---
 indra/cmake/Boost.cmake | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 0b7eb7e99b..b9c047a764 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -37,17 +37,17 @@ else (STANDALONE)
     else(MSVC80)
       # MSVC 10.0 config
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc100-mt
-          debug libboost_program_options-vc100-mt-gd)
+          optimized libboost_program_options-vc100-mt-${BOOST_VERSION}
+          debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION})
       set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc100-mt
-          debug libboost_regex-vc100-mt-gd)
+          optimized libboost_regex-vc100-mt-${BOOST_VERSION}
+          debug libboost_regex-vc100-mt-gd-${BOOST_VERSION})
       set(BOOST_SYSTEM_LIBRARY 
-          optimized libboost_system-vc100-mt
-          debug libboost_system-vc100-mt-gd)
+          optimized libboost_system-vc100-mt-${BOOST_VERSION}
+          debug libboost_system-vc100-mt-gd-${BOOST_VERSION})
       set(BOOST_FILESYSTEM_LIBRARY 
-          optimized libboost_filesystem-vc100-mt
-          debug libboost_filesystem-vc100-mt-gd)    
+          optimized libboost_filesystem-vc100-mt-${BOOST_VERSION}
+          debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION})    
     endif (MSVC80)
   elseif (DARWIN)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt)
-- 
cgit v1.2.3


From 00d9cc90adfb7980a71aec83be150497bc410c12 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Wed, 26 Jan 2011 11:13:52 -0800
Subject: Updated Windows build flags to set _SECURE_SCL. Removed some
 duplicate declarations.

---
 indra/cmake/00-Common.cmake | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 25a1b05d8e..15b827b217 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -7,10 +7,10 @@ include(Variables)
 # Portable compilation flags.
 set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
 set(CMAKE_CXX_FLAGS_RELEASE
-    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DNDEBUG") 
+    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG") 
 
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-    "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
+    "-DLL_RELEASE=1 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
 # Configure crash reporting
 set(RELEASE_CRASH_REPORTING OFF CACHE BOOL "Enable use of crash reporting in release builds")
@@ -36,13 +36,13 @@ if (WINDOWS)
   # Don't build DLLs.
   set(BUILD_SHARED_LIBS OFF)
 
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP"
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1"
       CACHE STRING "C++ compiler debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2"
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2 -D_SECURE_STL=0"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2"
+      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
       CACHE STRING "C++ compiler release options" FORCE)
 
   set(CMAKE_CXX_STANDARD_LIBRARIES "")
@@ -59,18 +59,9 @@ if (WINDOWS)
       /Zc:forScope
       /nologo
       /Oy-
-      )
-     
-  if(MSVC)
-    set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
-      CACHE STRING "C++ compiler release options" FORCE)
-   
-    add_definitions(
       /Zc:wchar_t-
       )
-  endif (MSVC)
-  
+     
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT VS_DISABLE_FATAL_WARNINGS)
     add_definitions(/WX)
-- 
cgit v1.2.3


From f05f2412b2d193b4c767fd30e1e1ef1a3dd404c8 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Mon, 31 Jan 2011 12:31:36 -0800
Subject: patches to use new jsoncpp lib on windows

---
 indra/cmake/JsonCpp.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 7dd565be7c..5d571e734a 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -11,8 +11,8 @@ else (STANDALONE)
   use_prebuilt_binary(jsoncpp)
   if (WINDOWS)
     set(JSONCPP_LIBRARIES 
-      debug json_vc80d
-      optimized json_vc80)
+#      debug json_vc100_libmt
+      optimized json_vc100_libmt)
   elseif (DARWIN)
     set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
   elseif (LINUX)
-- 
cgit v1.2.3


From d9a0a04af4d48d8f1e8ef6e70d3d0863689071bd Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Mon, 31 Jan 2011 12:54:57 -0800
Subject: find latest DirectX dirs.

---
 indra/cmake/DirectX.cmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake
index 29724ee2fc..b2a18805d4 100644
--- a/indra/cmake/DirectX.cmake
+++ b/indra/cmake/DirectX.cmake
@@ -3,6 +3,7 @@
 if (VIEWER AND WINDOWS)
   find_path(DIRECTX_INCLUDE_DIR dxdiag.h
             "$ENV{DXSDK_DIR}/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include"
@@ -24,6 +25,7 @@ if (VIEWER AND WINDOWS)
 
   find_path(DIRECTX_LIBRARY_DIR dxguid.lib
             "$ENV{DXSDK_DIR}/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86"
-- 
cgit v1.2.3


From 8adcaa147de9e8dabaf6e64fbd8af0ccc61c4519 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 31 Jan 2011 15:19:49 -0800
Subject: update mac and linux json libs.

---
 indra/cmake/JsonCpp.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 5d571e734a..d878f70a17 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -14,9 +14,9 @@ else (STANDALONE)
 #      debug json_vc100_libmt
       optimized json_vc100_libmt)
   elseif (DARWIN)
-    set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
+    set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt)
   elseif (LINUX)
-    set(JSONCPP_LIBRARIES jsoncpp)
+    set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt)
   endif (WINDOWS)
   set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp)
 endif (STANDALONE)
-- 
cgit v1.2.3


From 48bf6b19b36a3ff3f5b3d440d511a0e3dba3d768 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Mon, 31 Jan 2011 15:55:42 -0800
Subject: build uses latest jsoncpp package with new layout.

---
 indra/cmake/JsonCpp.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 5d571e734a..27cb22024e 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -18,5 +18,5 @@ else (STANDALONE)
   elseif (LINUX)
     set(JSONCPP_LIBRARIES jsoncpp)
   endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp)
+  set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json)
 endif (STANDALONE)
-- 
cgit v1.2.3


From cbffa57351cdbdd189cf8251fdab0b62690fa33a Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Fri, 4 Feb 2011 12:52:36 -0800
Subject: fix linking to llqtwebkit.

---
 indra/cmake/WebKitLibPlugin.cmake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 1f5b0f5d84..1cc02c1cac 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -35,6 +35,7 @@ else (STANDALONE)
 endif (STANDALONE)
 
 if (WINDOWS)
+  use_prebuilt_binary(qt)
   set(WEBKIT_PLUGIN_LIBRARIES
       debug llqtwebkitd
       debug QtWebKitd4
-- 
cgit v1.2.3


From 66612d334d85c545f43b649adf3e3ffc89185edb Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Mon, 7 Feb 2011 12:56:30 -0800
Subject: there is no mt for vs2010

---
 indra/cmake/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 3c7ae50df1..9ef49db07d 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -29,7 +29,8 @@ set(cmake_SOURCE_FILES
     FindFMOD.cmake
     FindGooglePerfTools.cmake
     FindMono.cmake
-    FindMT.cmake
+# MT deprecated in VS2010
+#    FindMT.cmake
     FindMySQL.cmake
     FindOpenJPEG.cmake
     FindXmlRpcEpi.cmake
-- 
cgit v1.2.3


From c2bfa25299c798b811c50b2f6f793d3a9bb914dd Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Mon, 7 Feb 2011 16:46:18 -0800
Subject: update pacageing of msvc?100.dll's; use latest qt package with all
 needed libs.

---
 indra/cmake/Copy3rdPartyLibs.cmake | 56 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 1f6fe6fedf..938cec3800 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -119,6 +119,62 @@ if (MSVC80)
         set(third_party_targets ${third_party_targets} ${out_targets})
           
     endif (EXISTS ${release_msvc8_redist_path})
+elseif (MSVC_VERSION EQUAL 1600) # VisualStudio 2010
+    FIND_PATH(debug_msvc10_redist_path msvcr100d.dll
+        PATHS
+        ${MSVC_DEBUG_REDIST_PATH}
+         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC100.DebugCRT
+        NO_DEFAULT_PATH
+        NO_DEFAULT_PATH
+        )
+
+    if(EXISTS ${debug_msvc10_redist_path})
+        set(debug_msvc10_files
+            msvcr100d.dll
+            msvcp100d.dll
+            )
+
+        copy_if_different(
+            ${debug_msvc10_redist_path}
+            "${SHARED_LIB_STAGING_DIR_DEBUG}"
+            out_targets
+            ${debug_msvc10_files}
+            )
+        set(third_party_targets ${third_party_targets} ${out_targets})
+
+    endif ()
+
+    FIND_PATH(release_msvc10_redist_path msvcr100.dll
+        PATHS
+        ${MSVC_REDIST_PATH}
+         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC100.CRT
+        NO_DEFAULT_PATH
+        NO_DEFAULT_PATH
+        )
+
+    if(EXISTS ${release_msvc10_redist_path})
+        set(release_msvc10_files
+            msvcr100.dll
+            msvcp100.dll
+            )
+
+        copy_if_different(
+            ${release_msvc10_redist_path}
+            "${SHARED_LIB_STAGING_DIR_RELEASE}"
+            out_targets
+            ${release_msvc10_files}
+            )
+        set(third_party_targets ${third_party_targets} ${out_targets})
+
+        copy_if_different(
+            ${release_msvc10_redist_path}
+            "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
+            out_targets
+            ${release_msvc10_files}
+            )
+        set(third_party_targets ${third_party_targets} ${out_targets})
+          
+    endif ()
 endif (MSVC80)
 
 elseif(DARWIN)
-- 
cgit v1.2.3


From 6dd41886b3dfbc2df4ccc6bb75722a5aaee23682 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Tue, 8 Feb 2011 12:14:17 -0800
Subject: fix a couple more packaging problems...

---
 indra/cmake/Copy3rdPartyLibs.cmake | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 938cec3800..0c65229afc 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -37,6 +37,8 @@ if(WINDOWS)
         libapr-1.dll
         libaprutil-1.dll
         libapriconv-1.dll
+        ssleay32.dll
+        libeay32.dll
         )
 
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
@@ -46,6 +48,8 @@ if(WINDOWS)
         libaprutil-1.dll
         libapriconv-1.dll
         dbghelp.dll
+        ssleay32.dll
+        libeay32.dll
         )
 
     if(USE_GOOGLE_PERFTOOLS)
-- 
cgit v1.2.3


From 38a2af923561f8865976843c58a21f851695c9c2 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Thu, 10 Feb 2011 17:26:16 -0800
Subject: various fixes to get the debug build working; don't look for or copy
 msvc*80.dll's.

---
 indra/cmake/JsonCpp.cmake         | 2 +-
 indra/cmake/WebKitLibPlugin.cmake | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 4a129d7115..5e6672ecd4 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -11,7 +11,7 @@ else (STANDALONE)
   use_prebuilt_binary(jsoncpp)
   if (WINDOWS)
     set(JSONCPP_LIBRARIES 
-#      debug json_vc100_libmt
+      debug json_vc100debug_libmt.lib
       optimized json_vc100_libmt)
   elseif (DARWIN)
     set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt)
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 1cc02c1cac..1f5b0f5d84 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -35,7 +35,6 @@ else (STANDALONE)
 endif (STANDALONE)
 
 if (WINDOWS)
-  use_prebuilt_binary(qt)
   set(WEBKIT_PLUGIN_LIBRARIES
       debug llqtwebkitd
       debug QtWebKitd4
-- 
cgit v1.2.3


From faecf0fe9ac5f15f8364211b095e00a27811dab7 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Wed, 16 Feb 2011 15:56:31 -0800
Subject: for now, turn off precompiled header usage by default (so
 Incredibuild will work).

---
 indra/cmake/Variables.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 88cfdfc0b9..ed5e2dee2d 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -148,7 +148,7 @@ For more information, please see JIRA DEV-14943 - Cmake Linux cannot build both
 endif (LINUX AND SERVER AND VIEWER)
 
 
-set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.")
+set(USE_PRECOMPILED_HEADERS OFF CACHE BOOL "Enable use of precompiled header directives where supported.")
 
 source_group("CMake Rules" FILES CMakeLists.txt)
 
-- 
cgit v1.2.3


From ae1435e8ee63a7d0e6ada77303eb01802580ec8e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 17 Feb 2011 21:13:48 -0800
Subject: Autobuild: fix for Mac build using XCode

---
 indra/cmake/JsonCpp.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 5e6672ecd4..96488360a4 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -14,7 +14,7 @@ else (STANDALONE)
       debug json_vc100debug_libmt.lib
       optimized json_vc100_libmt)
   elseif (DARWIN)
-    set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt)
+    set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a)
   elseif (LINUX)
     set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt)
   endif (WINDOWS)
-- 
cgit v1.2.3


From 531de7491b0e73031538dbb9f5dc0dbea8e5f8e2 Mon Sep 17 00:00:00 2001
From: squire <squire@lindenlab.com>
Date: Mon, 21 Feb 2011 18:57:54 -0800
Subject: Changes windows build and PNG cmake to reflect latests libpng builds

---
 indra/cmake/PNG.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index f6522d9e2f..33fc3e5bac 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -8,6 +8,6 @@ if (STANDALONE)
   include(FindPNG)
 else (STANDALONE)
   use_prebuilt_binary(libpng)
-  set(PNG_LIBRARIES png12)
-  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12)
+  set(PNG_LIBRARIES libpng15)
+  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
 endif (STANDALONE)
-- 
cgit v1.2.3


From 1db3f3b5cede4971049a91f5cb99f76fd0952b54 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Thu, 24 Feb 2011 12:27:58 -0800
Subject: integrate xmlrpc-epi into windows build.

---
 indra/cmake/XmlRpcEpi.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake
index 107d1926ba..5bd4848245 100644
--- a/indra/cmake/XmlRpcEpi.cmake
+++ b/indra/cmake/XmlRpcEpi.cmake
@@ -9,7 +9,10 @@ if (STANDALONE)
 else (STANDALONE)
     use_prebuilt_binary(xmlrpc-epi)
     if (WINDOWS)
-        set(XMLRPCEPI_LIBRARIES xmlrpcepi)
+        set(XMLRPCEPI_LIBRARIES 
+            debug xmlrpc-epid
+            optimized xmlrpc-epi
+        )
     else (WINDOWS)
         set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
     endif (WINDOWS)
-- 
cgit v1.2.3


From c5aaefe37f9d7e894076dae26245a3d87f74d0ff Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Tue, 1 Mar 2011 13:13:05 -0800
Subject: fix some mac build problems with library name changes with new
 packaages.

---
 indra/cmake/CARes.cmake | 5 +----
 indra/cmake/JPEG.cmake  | 5 +----
 indra/cmake/PNG.cmake   | 9 +++++++--
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake
index 1850b706ac..b0dac5b12f 100644
--- a/indra/cmake/CARes.cmake
+++ b/indra/cmake/CARes.cmake
@@ -13,10 +13,7 @@ else (STANDALONE)
     if (WINDOWS)
         set(CARES_LIBRARIES areslib)
     elseif (DARWIN)
-        set(CARES_LIBRARIES
-          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.a
-          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcares.a
-          )
+       set(CARES_LIBRARIES cares)
     else (WINDOWS)
         set(CARES_LIBRARIES cares)
     endif (WINDOWS)
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 9514d59f64..0f0bbb9564 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -12,10 +12,7 @@ else (STANDALONE)
   if (LINUX)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
-    set(JPEG_LIBRARIES
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a
-      )
+    set(JPEG_LIBRARIES lljpeg)
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib)
   endif (LINUX)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 33fc3e5bac..86b7267494 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -8,6 +8,11 @@ if (STANDALONE)
   include(FindPNG)
 else (STANDALONE)
   use_prebuilt_binary(libpng)
-  set(PNG_LIBRARIES libpng15)
-  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
+  if (WINDOWS)
+    set(PNG_LIBRARIES libpng15)
+    set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
+  else()
+    set(PNG_LIBRARIES png12)
+    set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12)
+  endif()
 endif (STANDALONE)
-- 
cgit v1.2.3


From 88f507f9ccae33a3fa9b3706a96af5c87db804b5 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Tue, 1 Mar 2011 15:32:35 -0800
Subject: fixes to get openal working on windows.

---
 indra/cmake/OPENAL.cmake | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index ed483e5aea..a3e1fb924e 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -9,6 +9,7 @@ else (LINUX)
 endif (LINUX)
 
 if (OPENAL)
+  set(OPENAL_LIB_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/AL")
   if (STANDALONE)
     include(FindPkgConfig)
     include(FindOpenAL)
@@ -17,10 +18,17 @@ if (OPENAL)
   else (STANDALONE)
     use_prebuilt_binary(openal_soft)
   endif (STANDALONE)
-  set(OPENAL_LIBRARIES 
-    openal
-    alut
+  if(WINDOWS)
+    set(OPENAL_LIBRARIES 
+      OpenAL32
+      alut
     )
+  else()
+    set(OPENAL_LIBRARIES 
+      openal
+      alut
+    )
+  endif()
 endif (OPENAL)
 
 if (OPENAL)
-- 
cgit v1.2.3


From 99ba5e2670d04baf641c6d612f253a46f857769e Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Wed, 2 Mar 2011 21:28:26 +0000
Subject: revert to old jsoncpp library on linux to fix build.

---
 indra/cmake/JsonCpp.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 96488360a4..9024fa92a7 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -16,7 +16,7 @@ else (STANDALONE)
   elseif (DARWIN)
     set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a)
   elseif (LINUX)
-    set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt)
+    set(JSONCPP_LIBRARIES libjsoncpp.a)
   endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json)
+  set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json")
 endif (STANDALONE)
-- 
cgit v1.2.3