From 97e6c15e935666c1b295b7508a182d0da4b481f1 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 19 Nov 2008 12:51:29 -0600
Subject: VWR-2662: OpenAL support (patch by Tofu Linden)

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

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/LLAudio.cmake b/linden/indra/cmake/LLAudio.cmake
index 7b9f254..893aa68 100644
--- a/linden/indra/cmake/LLAudio.cmake
+++ b/linden/indra/cmake/LLAudio.cmake
@@ -1,6 +1,7 @@
 # -*- cmake -*-
 
 include(Audio)
+include(OPENAL)
 
 set(LLAUDIO_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llaudio
@@ -12,4 +13,5 @@ set(LLAUDIO_LIBRARIES
     ${VORBISFILE_LIBRARIES}
     ${VORBIS_LIBRARIES}
     ${OGG_LIBRARIES}
+    ${OPENAL_LIBRARIES}
     )
-- 
cgit v1.1


From e563b107a2b58935ef8c3ab2cfdfdbc2d7cdfa2d Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 19 Nov 2008 19:48:44 -0600
Subject: (Forgot to check this file in with the OpenAL patch.)

---
 linden/indra/cmake/OPENAL.cmake | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 linden/indra/cmake/OPENAL.cmake

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
new file mode 100644
index 0000000..b0d9dac
--- /dev/null
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -0,0 +1,14 @@
+# -*- cmake -*-
+
+set(OPENAL OFF CACHE BOOL "Enable OpenAL")
+
+if (OPENAL)
+  include(FindPkgConfig)
+  pkg_check_modules(OPENAL_LIB REQUIRED openal)
+  pkg_check_modules(FREEAULT_LIB REQUIRED freealut)
+  set(OPENAL_LIBRARIES 
+    openal
+    alut
+    )
+  
+endif (OPENAL)
-- 
cgit v1.1


From bb5e735d6e9c1a0179a10b838d8126bd301649d8 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 20 Nov 2008 12:54:34 -0600
Subject: Enable OpenAL by default.

Configure with -DOPENAL:BOOL=OFF to disable.
---
 linden/indra/cmake/OPENAL.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index b0d9dac..1849fbf 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -1,6 +1,6 @@
 # -*- cmake -*-
 
-set(OPENAL OFF CACHE BOOL "Enable OpenAL")
+set(OPENAL ON CACHE BOOL "Enable OpenAL")
 
 if (OPENAL)
   include(FindPkgConfig)
-- 
cgit v1.1


From b4e5b8567b18a9289b912c720255a7f5d3bcdbf1 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 21 Nov 2008 21:25:58 -0600
Subject: Cross-platform checking for OpenAL libs.

---
 linden/indra/cmake/LLAudio.cmake |  1 +
 linden/indra/cmake/OPENAL.cmake  | 83 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 78 insertions(+), 6 deletions(-)

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/LLAudio.cmake b/linden/indra/cmake/LLAudio.cmake
index 893aa68..dcfd269 100644
--- a/linden/indra/cmake/LLAudio.cmake
+++ b/linden/indra/cmake/LLAudio.cmake
@@ -5,6 +5,7 @@ include(OPENAL)
 
 set(LLAUDIO_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llaudio
+    ${OPENAL_INCLUDE_DIRS}
     )
 
 set(LLAUDIO_LIBRARIES
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 1849fbf..277e3f9 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -2,13 +2,84 @@
 
 set(OPENAL ON CACHE BOOL "Enable OpenAL")
 
+
 if (OPENAL)
-  include(FindPkgConfig)
-  pkg_check_modules(OPENAL_LIB REQUIRED openal)
-  pkg_check_modules(FREEAULT_LIB REQUIRED freealut)
-  set(OPENAL_LIBRARIES 
-    openal
-    alut
+
+  # message(STATUS "Building with OpenAL audio support")
+
+  # OPENAL_LIB
+
+  find_library(OPENAL_LIB
+    NAMES openal OpenAL OpenAL32 wrap_oal
+    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+    )
+
+  if (NOT OPENAL_LIB)
+    message(FATAL_ERROR "OpenAL not found!")
+  else (NOT OPENAL_LIB)
+    # message(STATUS "OpenAL found: ${OPENAL_LIB}")
+  endif (NOT OPENAL_LIB)
+
+
+
+  # OPENAL_INCLUDE_DIR
+
+  find_path(OPENAL_INCLUDE_DIR
+    NAMES al.h
+    PATHS ${LIBS_PREBUILT_DIR}/include
+    )
+
+  if (NOT OPENAL_INCLUDE_DIR)
+    message(FATAL_ERROR "al.h not found!")
+  else (NOT OPENAL_INCLUDE_DIR)
+    # message(STATUS "al.h found in: ${OPENAL_INCLUDE_DIR}")
+  endif (NOT OPENAL_INCLUDE_DIR)
+
+
+
+  # ALUT_LIB
+
+  find_library(ALUT_LIB
+    NAMES alut freealut
+    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+    )
+
+  if (NOT ALUT_LIB)
+    message(FATAL_ERROR "ALUT not found!")
+  else (NOT ALUT_LIB)
+    # message(STATUS "ALUT found: ${ALUT_LIB}")
+  endif (NOT ALUT_LIB)
+
+
+
+  # ALUT_INCLUDE_DIR
+
+  find_path(ALUT_INCLUDE_DIR
+    NAMES alut.h
+    PATHS ${LIBS_PREBUILT_DIR}/include
+    )
+
+  if (NOT ALUT_INCLUDE_DIR)
+    message(FATAL_ERROR "alut.h not found!")
+  else (NOT ALUT_INCLUDE_DIR)
+    # message(STATUS "alut.h found in: ${ALUT_INCLUDE_DIR}")
+  endif (NOT ALUT_INCLUDE_DIR)
+
+
+
+  set(OPENAL_LIBRARIES
+    ${OPENAL_LIB}
+    ${ALUT_LIB}
+    )
+
+  set(OPENAL_INCLUDE_DIRS
+    ${OPENAL_INCLUDE_DIR}
+    ${ALUT_INCLUDE_DIR}
     )
   
+
+  set(OPENAL_FOUND TRUE CACHE BOOL
+    "Found OpenAL and ALUT libraries successfully"
+    )
+
 endif (OPENAL)
-- 
cgit v1.1


From 8630194534565adc674dd5bdc748aa97ba52f1ee Mon Sep 17 00:00:00 2001
From: unknown
Date: Tue, 30 Dec 2008 03:15:50 -0700
Subject: Removed llkdu from cmake

---
 linden/indra/cmake/CopyWinLibs.cmake | 48 +-----------------------------------
 linden/indra/cmake/LLKDU.cmake       | 20 ---------------
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 linden/indra/cmake/LLKDU.cmake

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 345761a..e2c45fd 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -105,51 +105,5 @@ copy_if_different(
     )
 set(all_targets ${all_targets} ${out_targets})
 
-set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
-if(EXISTS ${internal_llkdu_path})
-    set(internal_llkdu_src "${CMAKE_BINARY_DIR}/llkdu/${CMAKE_CFG_INTDIR}/llkdu.dll")
-    set(llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${internal_llkdu_src} ${llkdu_dst}
-        DEPENDS ${internal_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
-        )
-    set(all_targets ${all_targets} ${llkdu_dst})
-else(EXISTS ${internal_llkdu_path})
-    set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
-    set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${debug_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst}
-        DEPENDS ${debug_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug"
-        )
-    set(all_targets ${all_targets} ${debug_llkdu_dst})
 
-    set(release_llkdu_src "${release_src_dir}/llkdu.dll")
-    set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${release_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst}
-        DEPENDS ${release_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release"
-        )
-    set(all_targets ${all_targets} ${release_llkdu_dst})
-
-    set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${relwithdebinfo_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst}
-        DEPENDS ${release_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-        )
-    set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst})
-   
-endif (EXISTS ${internal_llkdu_path})
-
-add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
-
-if(EXISTS ${internal_llkdu_path})
-    add_dependencies(copy_win_libs llkdu)
-endif(EXISTS ${internal_llkdu_path})
+add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
\ No newline at end of file
diff --git a/linden/indra/cmake/LLKDU.cmake b/linden/indra/cmake/LLKDU.cmake
deleted file mode 100644
index a02b5d9..0000000
--- a/linden/indra/cmake/LLKDU.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
-  use_prebuilt_binary(kdu)
-  if (WINDOWS)
-    set(KDU_LIBRARY debug kdu_cored optimized kdu_core)
-  elseif (LINUX)
-    set(KDU_LIBRARY kdu_v42R)
-  else (WINDOWS)
-    set(KDU_LIBRARY kdu)
-  endif (WINDOWS)
-
-  set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-
-  set(LLKDU_LIBRARY llkdu)
-  set(LLKDU_STATIC_LIBRARY llkdu_static)
-  set(LLKDU_LIBRARIES ${LLKDU_LIBRARY})
-  set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY})
-endif (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
-- 
cgit v1.1


From 5e0090c8daa5ae53f7907bbd2b6145f252f278cd Mon Sep 17 00:00:00 2001
From: unknown
Date: Tue, 30 Dec 2008 11:34:13 -0700
Subject: Added fix for VWR-10392 as well as other fixes

---
 linden/indra/cmake/00-Common.cmake       |  8 +++++
 linden/indra/cmake/APR.cmake             | 23 +++++--------
 linden/indra/cmake/CopyWinLibs.cmake     | 57 +++++++++++++++++++++++++++++++-
 linden/indra/cmake/DBusGlib.cmake        | 29 ++++++++++++++++
 linden/indra/cmake/DirectX.cmake         | 22 ++++++------
 linden/indra/cmake/FindMono.cmake        | 18 +++++-----
 linden/indra/cmake/GooglePerfTools.cmake |  6 +++-
 linden/indra/cmake/LLXML.cmake           |  2 ++
 linden/indra/cmake/Linking.cmake         |  8 ++---
 linden/indra/cmake/NDOF.cmake            |  6 ++--
 linden/indra/cmake/Python.cmake          |  1 +
 linden/indra/cmake/QuickTime.cmake       | 22 ++++++++++--
 12 files changed, 156 insertions(+), 46 deletions(-)
 create mode 100644 linden/indra/cmake/DBusGlib.cmake

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 977e588..c41591f 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -49,6 +49,10 @@ if (WINDOWS)
       )
      
   if(MSVC80 OR MSVC90)
+    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-
       )
@@ -165,6 +169,10 @@ if (DARWIN)
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
+  # NOTE: it's critical that the optimization flag is put in front.
+  # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+  set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 endif (DARWIN)
 
 
diff --git a/linden/indra/cmake/APR.cmake b/linden/indra/cmake/APR.cmake
index 2a96d70..2563a98 100644
--- a/linden/indra/cmake/APR.cmake
+++ b/linden/indra/cmake/APR.cmake
@@ -15,24 +15,16 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(apr_suite)
   if (WINDOWS)
-    set(WINLIBS_PREBUILT_DEBUG_DIR 
-      ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug
-      )
-    set(WINLIBS_PREBUILT_RELEASE_DIR 
-      ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
-      )
     set(APR_LIBRARIES 
-      debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apr-1.lib
-      optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apr-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${WINLIBS_PREBUILT_DEBUG_DIR}/aprutil-1.lib
-      optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/aprutil-1.lib
-      )
-    set(APRICONV_LIBRARIES 
-      debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apriconv-1.lib
-      optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apriconv-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib
       )
+    # Doesn't need to link with iconv.dll
+    set(APRICONV_LIBRARIES "")
   elseif (DARWIN)
     set(APR_LIBRARIES 
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
@@ -42,10 +34,11 @@ else (STANDALONE)
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
       )
-    set(APRICONV_LIBRARIES apriconv-1)
+    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)
 
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index e2c45fd..3234bfa 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -106,4 +106,59 @@ copy_if_different(
 set(all_targets ${all_targets} ${out_targets})
 
 
-add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
\ No newline at end of file
+# Copy MS C runtime dlls, required for packaging.
+# *TODO - Adapt this to support VC9
+if (MSVC80)
+    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
+        PATHS
+        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
+        )
+
+    if(EXISTS ${debug_msvc8_redist_path})
+        set(debug_msvc8_files
+            msvcr80d.dll
+            msvcp80d.dll
+            Microsoft.VC80.DebugCRT.manifest
+            )
+
+        copy_if_different(
+            ${debug_msvc8_redist_path} 
+            "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+            out_targets 
+            ${debug_msvc8_files}
+            )
+        set(all_targets ${all_targets} ${out_targets})
+    endif (EXISTS ${debug_msvc8_redist_path})
+
+    FIND_PATH(release_msvc8_redist_path msvcr80.dll
+        PATHS
+        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
+        )
+
+    if(EXISTS ${release_msvc8_redist_path})
+        set(release_msvc8_files
+            msvcr80.dll
+            msvcp80.dll
+            Microsoft.VC80.CRT.manifest
+            )
+
+        copy_if_different(
+            ${release_msvc8_redist_path} 
+            "${CMAKE_CURRENT_BINARY_DIR}/Release"
+            out_targets 
+            ${release_msvc8_files}
+            )
+        set(all_targets ${all_targets} ${out_targets})
+
+        copy_if_different(
+            ${release_msvc8_redist_path} 
+            "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+            out_targets 
+            ${release_msvc8_files}
+            )
+        set(all_targets ${all_targets} ${out_targets})
+
+    endif (EXISTS ${release_msvc8_redist_path})
+endif (MSVC80)
+
+add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
diff --git a/linden/indra/cmake/DBusGlib.cmake b/linden/indra/cmake/DBusGlib.cmake
new file mode 100644
index 0000000..cfc4ccd
--- /dev/null
+++ b/linden/indra/cmake/DBusGlib.cmake
@@ -0,0 +1,29 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindPkgConfig)
+
+  pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
+
+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
+      )
+  # We don't need to explicitly link against dbus-glib itself, because
+  # the viewer probes for the system's copy at runtime.
+  set(DBUSGLIB_LIBRARIES
+      gobject-2.0
+      glib-2.0
+      )
+endif (STANDALONE)
+
+if (DBUSGLIB_FOUND)
+  set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.")
+endif (DBUSGLIB_FOUND)
+
+if (DBUSGLIB)
+  add_definitions(-DLL_DBUS_ENABLED=1)
+endif (DBUSGLIB)
diff --git a/linden/indra/cmake/DirectX.cmake b/linden/indra/cmake/DirectX.cmake
index 4d2d5e0..d406f37 100644
--- a/linden/indra/cmake/DirectX.cmake
+++ b/linden/indra/cmake/DirectX.cmake
@@ -3,12 +3,13 @@
 if (VIEWER AND WINDOWS)
   find_path(DIRECTX_INCLUDE_DIR dxdiag.h
             "$ENV{DXSDK_DIR}/Include"
-            "C:/Program Files/Microsoft DirectX SDK (June 2008)/Include"
-            "C:/Program Files/Microsoft DirectX SDK (March 2008)/Include"
-            "C:/Program Files/Microsoft DirectX SDK (November 2007)/Include"
-            "C:/Program Files/Microsoft DirectX SDK (August 2007)/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (November 2007)/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2007)/Include"
             "C:/DX90SDK/Include"
-            "C:/Program Files/DX90SDK/Include"
+            "$ENV{PROGRAMFILES}/DX90SDK/Include"
             )
   if (DIRECTX_INCLUDE_DIR)
     include_directories(${DIRECTX_INCLUDE_DIR})
@@ -22,12 +23,13 @@ if (VIEWER AND WINDOWS)
 
   find_path(DIRECTX_LIBRARY_DIR dxguid.lib
             "$ENV{DXSDK_DIR}/Lib/x86"
-            "C:/Program Files/Microsoft DirectX SDK (June 2008)/Lib/x86"
-            "C:/Program Files/Microsoft DirectX SDK (March 2008)/Lib/x86"
-            "C:/Program Files/Microsoft DirectX SDK (November 2007)/Lib/x86"
-            "C:/Program Files/Microsoft DirectX SDK (August 2007)/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (November 2007)/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2007)/Lib/x86"
             "C:/DX90SDK/Lib"
-            "C:/Program Files/DX90SDK/Lib"
+            "$ENV{PROGRAMFILES}/DX90SDK/Lib"
             )
   if (DIRECTX_LIBRARY_DIR)
     if (DIRECTX_FIND_QUIETLY)
diff --git a/linden/indra/cmake/FindMono.cmake b/linden/indra/cmake/FindMono.cmake
index f0a0705..c36d725 100644
--- a/linden/indra/cmake/FindMono.cmake
+++ b/linden/indra/cmake/FindMono.cmake
@@ -14,29 +14,29 @@
 # Removed the check for gmcs
 
 FIND_PROGRAM (MONO_EXECUTABLE mono
-             "C:/Program Files/Mono-1.9.1/bin"
-             "C:/Program Files/Mono-1.2.6/bin"
+             "$ENV{PROGRAMFILES}/Mono-1.9.1/bin"
+             "$ENV{PROGRAMFILES}/Mono-1.2.6/bin"
              /bin
              /usr/bin
              /usr/local/bin
 )
 FIND_PROGRAM (MCS_EXECUTABLE mcs
-             "C:/Program Files/Mono-1.9.1/bin"
-             "C:/Program Files/Mono-1.2.6/bin"
+             "$ENV{PROGRAMFILES}/Mono-1.9.1/bin"
+             "$ENV{PROGRAMFILES}/Mono-1.2.6/bin"
              /bin
              /usr/bin
              /usr/local/bin
 )
 FIND_PROGRAM (GMCS_EXECUTABLE gmcs
-             "C:/Program Files/Mono-1.9.1/bin"
-             "C:/Program Files/Mono-1.2.6/bin"
+             "$ENV{PROGRAMFILES}/Mono-1.9.1/bin"
+             "$ENV{PROGRAMFILES}/Mono-1.2.6/bin"
              /bin
              /usr/bin
              /usr/local/bin
 )
 FIND_PROGRAM (GACUTIL_EXECUTABLE gacutil
-             "C:/Program Files/Mono-1.9.1/bin"
-             "C:/Program Files/Mono-1.2.6/bin"
+             "$ENV{PROGRAMFILES}/Mono-1.9.1/bin"
+             "$ENV{PROGRAMFILES}/Mono-1.2.6/bin"
              /bin
              /usr/bin
              /usr/local/bin
@@ -44,7 +44,7 @@ FIND_PROGRAM (GACUTIL_EXECUTABLE gacutil
 FIND_PROGRAM (ILASM_EXECUTABLE
              ilasm
              NO_DEFAULT_PATH
-             PATHS "C:/Program Files/Mono-1.9.1/bin" "C:/Apps/Mono-1.2.6/bin" "C:/Program Files/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin
+             PATHS "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin
 )
 
 SET (MONO_FOUND FALSE)
diff --git a/linden/indra/cmake/GooglePerfTools.cmake b/linden/indra/cmake/GooglePerfTools.cmake
index 9b3eca0..25e9f6d 100644
--- a/linden/indra/cmake/GooglePerfTools.cmake
+++ b/linden/indra/cmake/GooglePerfTools.cmake
@@ -19,10 +19,14 @@ if (GOOGLE_PERFTOOLS_FOUND)
   set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.")
 endif (GOOGLE_PERFTOOLS_FOUND)
 
+# XXX Disable temporarily, until we have compilation issues on 64-bit
+# Etch sorted.
+set(USE_GOOGLE_PERFTOOLS OFF)
+
 if (USE_GOOGLE_PERFTOOLS)
   set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
   include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
-  set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES})
+  set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES} ${PROFILER_LIBRARIES})
 else (USE_GOOGLE_PERFTOOLS)
   set(TCMALLOC_FLAG -ULL_USE_TCMALLOC)
 endif (USE_GOOGLE_PERFTOOLS)
diff --git a/linden/indra/cmake/LLXML.cmake b/linden/indra/cmake/LLXML.cmake
index 1ce93c0..dd2ebca 100644
--- a/linden/indra/cmake/LLXML.cmake
+++ b/linden/indra/cmake/LLXML.cmake
@@ -1,9 +1,11 @@
 # -*- cmake -*-
 
+include(Boost)
 include(EXPAT)
 
 set(LLXML_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llxml
+    ${Boost_INCLUDE_DIRS}
     ${EXPAT_INCLUDE_DIRS}
     )
 
diff --git a/linden/indra/cmake/Linking.cmake b/linden/indra/cmake/Linking.cmake
index c9748e3..167c5dd 100644
--- a/linden/indra/cmake/Linking.cmake
+++ b/linden/indra/cmake/Linking.cmake
@@ -7,15 +7,15 @@ if (NOT STANDALONE)
     set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
   elseif (LINUX)
     if (VIEWER)
-      set(ARCH_PREBUILT_DIRS 
-          ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client)
-      set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
-      set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
+      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})
   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})
   endif (WINDOWS)
 endif (NOT STANDALONE)
diff --git a/linden/indra/cmake/NDOF.cmake b/linden/indra/cmake/NDOF.cmake
index 3f715a2..dad74e9 100644
--- a/linden/indra/cmake/NDOF.cmake
+++ b/linden/indra/cmake/NDOF.cmake
@@ -3,12 +3,12 @@ include(Prebuilt)
 
 use_prebuilt_binary(ndofdev)
 
-if (WINDOWS OR DARWIN)
+if (WINDOWS OR DARWIN OR LINUX)
   add_definitions(-DLIB_NDOF=1)
-endif (WINDOWS OR DARWIN)
+endif (WINDOWS OR DARWIN OR LINUX)
 
 if (WINDOWS)
   set(NDOF_LIBRARY libndofdev)
-elseif (DARWIN)
+elseif (DARWIN OR LINUX)
   set(NDOF_LIBRARY ndofdev)
 endif (WINDOWS)
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake
index e9505fb..4f86d32 100644
--- a/linden/indra/cmake/Python.cmake
+++ b/linden/indra/cmake/Python.cmake
@@ -9,6 +9,7 @@ if (WINDOWS)
     NAMES python25.exe python23.exe python.exe
     NO_DEFAULT_PATH # added so that cmake does not find cygwin python
     PATHS
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
diff --git a/linden/indra/cmake/QuickTime.cmake b/linden/indra/cmake/QuickTime.cmake
index b79ac11..4352709 100644
--- a/linden/indra/cmake/QuickTime.cmake
+++ b/linden/indra/cmake/QuickTime.cmake
@@ -9,13 +9,29 @@ if (DARWIN)
   include(CMakeFindFrameworks)
   find_library(QUICKTIME_LIBRARY QuickTime)
 elseif (WINDOWS)
-  set(QUICKTIME_SDK_DIR "C:\\Program Files\\QuickTime SDK"
+  set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
       CACHE PATH "Location of the QuickTime SDK.")
-  find_library(QUICKTIME_LIBRARY qtmlclient
+
+  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
+               PATHS
+               ${ARCH_PREBUILT_DIRS_DEBUG}
+               "${QUICKTIME_SDK_DIR}\\libraries"
+               )
+
+  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
                PATHS
-               ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release
+               ${ARCH_PREBUILT_DIRS_RELEASE}
                "${QUICKTIME_SDK_DIR}\\libraries"
                )
+
+  if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
+    set(QUICKTIME_LIBRARY 
+        optimized ${RELEASE_QUICKTIME_LIBRARY}
+        debug ${DEBUG_QUICKTIME_LIBRARY}
+        )
+        
+  endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
+  
   include_directories(
     ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
     "${QUICKTIME_SDK_DIR}\\CIncludes"
-- 
cgit v1.1


From 2e7174082077c5b7312a6a4c35024a8cb41ca6dc Mon Sep 17 00:00:00 2001
From: unknown
Date: Thu, 8 Jan 2009 11:26:09 -0700
Subject: Added openal32.dll to CopyWinLibs.cmake.

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

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 3234bfa..0534ce6 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -37,6 +37,7 @@ set(debug_files
     xul.dll
     openjpegd.dll
     windbgdlg.exe
+    openal32.dll
     )
 
 copy_if_different(
@@ -71,6 +72,7 @@ set(release_files
     xpcom.dll
     xul.dll
     openjpeg.dll
+    openal32.dll
     )
     
 copy_if_different(
-- 
cgit v1.1


From b1d5121283a84f627ffba5d018001a6ae863fa1e Mon Sep 17 00:00:00 2001
From: unknown
Date: Thu, 8 Jan 2009 13:32:53 -0700
Subject: Added openal32.dll and alut.dll to CopyWinLibs.cmake

---
 linden/indra/cmake/CopyWinLibs.cmake | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 0534ce6..3d70c8f 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -14,7 +14,6 @@ set(vivox_files
     ssleay32.dll
     SLVoiceAgent.exe
     srtp.dll
-    alut.dll
     vivoxsdk.dll
     ortp.dll
     wrap_oal.dll
@@ -22,12 +21,15 @@ set(vivox_files
 
 set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
 set(debug_files
+    alut.dll
     freebl3.dll
     gksvggdiplus.dll
     js3250.dll
     nspr4.dll
     nss3.dll
     nssckbi.dll
+    openal32.dll
+    openjpegd.dll
     plc4.dll
     plds4.dll
     smime3.dll
@@ -35,9 +37,7 @@ set(debug_files
     ssl3.dll
     xpcom.dll
     xul.dll
-    openjpegd.dll
     windbgdlg.exe
-    openal32.dll
     )
 
 copy_if_different(
@@ -58,12 +58,15 @@ set(all_targets ${all_targets} ${out_targets})
 
 set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
 set(release_files
+    alut.dll
     freebl3.dll
     gksvggdiplus.dll
     js3250.dll
     nspr4.dll
     nss3.dll
     nssckbi.dll
+    openal32.dll
+    openjpeg.dll
     plc4.dll
     plds4.dll
     smime3.dll
@@ -71,8 +74,6 @@ set(release_files
     ssl3.dll
     xpcom.dll
     xul.dll
-    openjpeg.dll
-    openal32.dll
     )
     
 copy_if_different(
-- 
cgit v1.1


From 14c528c88c9c72443ccf344aedc8a2d2b8d8f0cd Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 11 Jan 2009 14:49:14 -0600
Subject: Removed references to unused dbusglib.

---
 linden/indra/cmake/DBusGlib.cmake | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 linden/indra/cmake/DBusGlib.cmake

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/DBusGlib.cmake b/linden/indra/cmake/DBusGlib.cmake
deleted file mode 100644
index cfc4ccd..0000000
--- a/linden/indra/cmake/DBusGlib.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-if (STANDALONE)
-  include(FindPkgConfig)
-
-  pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
-
-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
-      )
-  # We don't need to explicitly link against dbus-glib itself, because
-  # the viewer probes for the system's copy at runtime.
-  set(DBUSGLIB_LIBRARIES
-      gobject-2.0
-      glib-2.0
-      )
-endif (STANDALONE)
-
-if (DBUSGLIB_FOUND)
-  set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.")
-endif (DBUSGLIB_FOUND)
-
-if (DBUSGLIB)
-  add_definitions(-DLL_DBUS_ENABLED=1)
-endif (DBUSGLIB)
-- 
cgit v1.1


From d971dae8333841de1d4392f046d304917f9e31c1 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 11 Jan 2009 18:43:40 -0600
Subject: Added more gstreamer include paths.

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

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 10d5207..4369445 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -15,6 +15,8 @@ elseif (LINUX)
   set(GSTREAMER_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/glib-2.0/glib
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0/gobject
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
   # We don't need to explicitly link against gstreamer itself, because
-- 
cgit v1.1