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


From 7285dd9e42ffd58ea51335de96eadadb652f6b49 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Fri, 4 Mar 2011 14:49:20 -0800
Subject: ares, boost, expat, freetype archives updated to latest builds.

---
 indra/cmake/APR.cmake              |  4 ++--
 indra/cmake/Boost.cmake            | 10 +++++-----
 indra/cmake/Copy3rdPartyLibs.cmake |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 5b31b0d237..daafa00fe2 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -32,8 +32,8 @@ else (STANDALONE)
       )
   elseif (DARWIN)
     if (LLCOMMON_LINK_SHARED)
-      set(APR_selector     "0.3.7.dylib")
-      set(APRUTIL_selector "0.3.8.dylib")
+      set(APR_selector     "0.dylib")
+      set(APRUTIL_selector "0.dylib")
     else (LLCOMMON_LINK_SHARED)
       set(APR_selector     "a")
       set(APRUTIL_selector "a")
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index b9c047a764..67dc9f0891 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -50,11 +50,11 @@ else (STANDALONE)
           debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION})    
     endif (MSVC80)
   elseif (DARWIN)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt)
-    set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt)
-    set(BOOST_SIGNALS_LIBRARY boost_signals-xgcc40-mt)
-    set(BOOST_SYSTEM_LIBRARY boost_system-xgcc40-mt)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-xgcc40-mt)
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
+    set(BOOST_REGEX_LIBRARY boost_regex)
+#    set(BOOST_SIGNALS_LIBRARY boost_signals)
+    set(BOOST_SYSTEM_LIBRARY boost_system)
+    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
   elseif (LINUX)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 0c65229afc..43b0347aa9 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -200,11 +200,11 @@ elseif(DARWIN)
        )
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
-        libapr-1.0.3.7.dylib
+        libapr-1.0.dylib
         libapr-1.dylib
-        libaprutil-1.0.3.8.dylib
+        libaprutil-1.0.dylib
         libaprutil-1.dylib
-        libexpat.0.5.0.dylib
+        libexpat.1.5.2.dylib
         libexpat.dylib
         libllqtwebkit.dylib
         libndofdev.dylib
-- 
cgit v1.2.3


From 33927b8451bde10feeda0fc3d3c478b79ef2e0e2 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 11:44:51 -0800
Subject: update libpng and jpeglib archives for mac.

---
 indra/cmake/JPEG.cmake | 2 +-
 indra/cmake/PNG.cmake  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 0f0bbb9564..4f99efd602 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -12,7 +12,7 @@ else (STANDALONE)
   if (LINUX)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
-    set(JPEG_LIBRARIES lljpeg)
+    set(JPEG_LIBRARIES jpeg)
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib)
   endif (LINUX)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 86b7267494..60f749869a 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -11,6 +11,9 @@ else (STANDALONE)
   if (WINDOWS)
     set(PNG_LIBRARIES libpng15)
     set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
+  elseif(DARWIN)
+    set(PNG_LIBRARIES png15)
+    set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
   else()
     set(PNG_LIBRARIES png12)
     set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12)
-- 
cgit v1.2.3


From d9715317b17152c445f6c5933fbeb2c1e0900bba Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 14:54:50 -0800
Subject: update openSSL archive usage for darwin.

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

(limited to 'indra/cmake')

diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index c692b67b49..5982ee9a49 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -19,5 +19,5 @@ endif (STANDALONE)
 if (LINUX)
   set(CRYPTO_LIBRARIES crypto)
 elseif (DARWIN)
-  set(CRYPTO_LIBRARIES llcrypto)
+  set(CRYPTO_LIBRARIES crypto)
 endif (LINUX)
-- 
cgit v1.2.3


From 4947062236f9abe280beac8ba8abea22f3d1d226 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 00:48:20 +0000
Subject: update apr and sdl archives for linux; added new archive db (needed
 for linux only).

---
 indra/cmake/BerkeleyDB.cmake       | 3 ++-
 indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
 indra/cmake/LLWindow.cmake         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake
index e3ca0fd77d..57b53f46ff 100644
--- a/indra/cmake/BerkeleyDB.cmake
+++ b/indra/cmake/BerkeleyDB.cmake
@@ -8,7 +8,8 @@ if (STANDALONE)
 else (STANDALONE)
   if (LINUX)
     # Need to add dependency pthread explicitely to support ld.gold.
-    set(DB_LIBRARIES db-4.2 pthread)
+    use_prebuilt_binary(db)
+    set(DB_LIBRARIES db-5.1 pthread)
   else (LINUX)
     set(DB_LIBRARIES db-4.2)
   endif (LINUX)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 43b0347aa9..81ce7852ff 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -245,7 +245,7 @@ elseif(LINUX)
         libatk-1.0.so
         libbreakpad_client.so.0
         libcrypto.so.0.9.7
-        libdb-4.2.so
+        libdb-5.1.so
         libexpat.so
         libexpat.so.1
         libgmock_main.so
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index a5b9cf47a4..b4bb9a078a 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -18,7 +18,7 @@ else (STANDALONE)
     use_prebuilt_binary(SDL)
     set (SDL_FOUND TRUE)
     set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux)
-    set (SDL_LIBRARY SDL)
+    set (SDL_LIBRARY SDL directfb fusion direct)
   endif (LINUX AND VIEWER)
 endif (STANDALONE)
 
-- 
cgit v1.2.3


From acec15e723c066efc6eb1e38c98b7af4e9993809 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 17:53:15 +0000
Subject: update boost archive usage for linux.

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

(limited to 'indra/cmake')

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 67dc9f0891..2135f0584c 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -49,17 +49,10 @@ else (STANDALONE)
           optimized libboost_filesystem-vc100-mt-${BOOST_VERSION}
           debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION})    
     endif (MSVC80)
-  elseif (DARWIN)
+  elseif (DARWIN OR LINUX)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
     set(BOOST_REGEX_LIBRARY boost_regex)
-#    set(BOOST_SIGNALS_LIBRARY boost_signals)
     set(BOOST_SYSTEM_LIBRARY boost_system)
     set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
-  elseif (LINUX)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt)
-    set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt)
-    set(BOOST_SIGNALS_LIBRARY boost_signals-gcc41-mt)
-    set(BOOST_SYSTEM_LIBRARY boost_system-gcc41-mt)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-gcc41-mt)
   endif (WINDOWS)
 endif (STANDALONE)
-- 
cgit v1.2.3


From 4a8e5d9df9c21884d172741d3a5aec7d94f3914f Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 21:51:13 +0000
Subject: update dbusglib archive for linux.

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

(limited to 'indra/cmake')

diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake
index 33c6343a93..83c08d3350 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}/include/glib-2.0
+      ${LIBS_PREBUILT_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.
-- 
cgit v1.2.3


From b01b10bba3708b10440d59a7d0fd79430f5e37d7 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 22:43:33 +0000
Subject: remove ELFIO cruft; no longer needed now that we use google breakpad.

---
 indra/cmake/CMakeLists.txt |  3 ---
 indra/cmake/ELFIO.cmake    | 19 -------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 indra/cmake/ELFIO.cmake

(limited to 'indra/cmake')

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 9ef49db07d..89c1c3691a 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -20,7 +20,6 @@ set(cmake_SOURCE_FILES
     CSharpMacros.cmake
     DBusGlib.cmake
     DirectX.cmake
-    ELFIO.cmake
     EXPAT.cmake
     FindAPR.cmake
     FindBerkeleyDB.cmake
@@ -29,8 +28,6 @@ set(cmake_SOURCE_FILES
     FindFMOD.cmake
     FindGooglePerfTools.cmake
     FindMono.cmake
-# MT deprecated in VS2010
-#    FindMT.cmake
     FindMySQL.cmake
     FindOpenJPEG.cmake
     FindXmlRpcEpi.cmake
diff --git a/indra/cmake/ELFIO.cmake b/indra/cmake/ELFIO.cmake
deleted file mode 100644
index e51993b0f7..0000000000
--- a/indra/cmake/ELFIO.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- 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)
-  set(ELFIO_FOUND "YES")
-endif (STANDALONE)
-
-if (ELFIO_FOUND)
-  add_definitions(-DLL_ELFBIN=1)
-else (ELFIO_FOUND)
-  set(ELFIO_INCLUDE_DIR "")
-endif (ELFIO_FOUND)
-- 
cgit v1.2.3


From 353c54d6682614ad62d73ace66146602d6682584 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 00:27:44 +0000
Subject: update fontconfig archive for linux.

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

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 81ce7852ff..c942fafabd 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -261,6 +261,7 @@ elseif(LINUX)
         libtcmalloc.so
         libuuid.so.1
         libssl.so.0.9.7
+        libfontconfig.so.1.4.4
        )
 
     if (FMOD)
-- 
cgit v1.2.3


From fcdd82af83093a0e62200be7b1fc44e96fd76d57 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 23:50:00 +0000
Subject: update libpng archive for linux.

---
 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 60f749869a..913c575672 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -15,7 +15,7 @@ else (STANDALONE)
     set(PNG_LIBRARIES png15)
     set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
   else()
-    set(PNG_LIBRARIES png12)
-    set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12)
+    set(PNG_LIBRARIES png15)
+    set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
   endif()
 endif (STANDALONE)
-- 
cgit v1.2.3


From c41d9949d797312626d44c639766b285111d608b Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Mon, 14 Mar 2011 20:01:31 +0000
Subject: update llqtwebkit usage.

---
 indra/cmake/WebKitLibPlugin.cmake | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 1f5b0f5d84..8fb717cdb8 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -62,10 +62,6 @@ elseif (LINUX)
   else (STANDALONE)
     set(WEBKIT_PLUGIN_LIBRARIES
         llqtwebkit
-
-        qgif
-        qjpeg
-
         QtWebKit
         QtOpenGL
         QtNetwork
-- 
cgit v1.2.3


From 17343b76dfc9351c6a7dc109ea11327306d250cc Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Mon, 14 Mar 2011 22:43:09 +0000
Subject: update openssl archive for 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 c942fafabd..f1584ff0c4 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -244,7 +244,7 @@ elseif(LINUX)
         libaprutil-1.so.0
         libatk-1.0.so
         libbreakpad_client.so.0
-        libcrypto.so.0.9.7
+        libcrypto.so.0.9.8
         libdb-5.1.so
         libexpat.so
         libexpat.so.1
@@ -260,7 +260,7 @@ elseif(LINUX)
         libstacktrace.so
         libtcmalloc.so
         libuuid.so.1
-        libssl.so.0.9.7
+        libssl.so.0.9.8
         libfontconfig.so.1.4.4
        )
 
-- 
cgit v1.2.3


From 72fd8c2ec428cea667af6fdb360d8f68f6af6d6d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 14 Mar 2011 23:57:57 -0700
Subject: Fix Mac Json cmake script

---
 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 9024fa92a7..644b417e17 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.a)
+    set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
   elseif (LINUX)
     set(JSONCPP_LIBRARIES libjsoncpp.a)
   endif (WINDOWS)
-- 
cgit v1.2.3


From 1de3c1e127706ebc6a16f152635d456dcd59c17f Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Tue, 15 Mar 2011 18:12:43 +0000
Subject: update jsoncpp archive on linux.

---
 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 9024fa92a7..499b00fb44 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 libjsoncpp.a)
+    set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a)
   endif (WINDOWS)
   set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json")
 endif (STANDALONE)
-- 
cgit v1.2.3


From cd8485f9c0535455142f7f979159dcf8027ae93c Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Tue, 15 Mar 2011 20:54:22 +0000
Subject: update uuid archive for linux.

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

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index f1584ff0c4..169502731d 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -259,7 +259,7 @@ elseif(LINUX)
         libssl.so
         libstacktrace.so
         libtcmalloc.so
-        libuuid.so.1
+        libuuid.so.16.0.22
         libssl.so.0.9.8
         libfontconfig.so.1.4.4
        )
-- 
cgit v1.2.3


From 38bdbbd01921e008a5882739992fd8139ec9e1fb Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Wed, 16 Mar 2011 16:06:47 +0000
Subject: rename google archive for linux to google-perftools and update to
 latest.

---
 indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
 indra/cmake/GooglePerfTools.cmake  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 169502731d..e2b7d3b888 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -257,8 +257,8 @@ elseif(LINUX)
         libopenal.so
         libopenjpeg.so
         libssl.so
-        libstacktrace.so
         libtcmalloc.so
+        libuuid.so.16
         libuuid.so.16.0.22
         libssl.so.0.9.8
         libfontconfig.so.1.4.4
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 133ae14d2f..6c784a3a76 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -12,9 +12,8 @@ else (STANDALONE)
     set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (WINDOWS)
   if (LINUX)
-    use_prebuilt_binary(google)
+    use_prebuilt_binary(google-perftools)
     set(TCMALLOC_LIBRARIES tcmalloc)
-    set(STACKTRACE_LIBRARIES stacktrace)
     set(PROFILER_LIBRARIES profiler)
     set(GOOGLE_PERFTOOLS_INCLUDE_DIR
         ${LIBS_PREBUILT_DIR}/include)
-- 
cgit v1.2.3