From 2a79326ff63d26f6f7d51ae195dfc7ab4600b407 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Mon, 2 Nov 2009 14:23:40 -0800
Subject: Removed tabs. Fixed errant 'else(APPLE)'

---
 indra/cmake/LLSharedLibs.cmake | 44 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake
index 3be22ab401..a8c81609bb 100644
--- a/indra/cmake/LLSharedLibs.cmake
+++ b/indra/cmake/LLSharedLibs.cmake
@@ -3,29 +3,29 @@
 # search_dirs: a list of dirs to search for the dependencies
 # dst_path: path to copy deps to, relative to the output location of the target_exe
 macro(ll_deploy_sharedlibs_command target_exe search_dirs dst_path) 
-	get_target_property(OUTPUT_LOCATION ${target_exe} LOCATION)
+  get_target_property(OUTPUT_LOCATION ${target_exe} LOCATION)
 
-	if(DARWIN)
-	  get_target_property(IS_BUNDLE ${target_exe} MACOSX_BUNDLE)
-	  if(IS_BUNDLE)
-		get_filename_component(TARGET_FILE ${OUTPUT_LOCATION} NAME)
-		set(OUTPUT_PATH ${OUTPUT_LOCATION}.app/Contents/MacOS)
-		set(OUTPUT_LOCATION ${OUTPUT_PATH}/${TARGET_FILE})
-	  endif(IS_BUNDLE)
-	else(APPLE)
-	  message(FATAL_ERROR "Only darwin currently supported!")
-	endif(DARWIN)
-
-	add_custom_command(
-	  TARGET ${target_exe} POST_BUILD
-	  COMMAND ${CMAKE_COMMAND} 
-	  ARGS
-        "-DBIN_NAME=\"${OUTPUT_LOCATION}\""
-		"-DSEARCH_DIRS=\"${search_dirs}\""
-		"-DDST_PATH=\"${OUTPUT_PATH}/${dst_path}\""
-		"-P"
-		"${CMAKE_SOURCE_DIR}/cmake/DeploySharedLibs.cmake"
-	  )
+  if(DARWIN)
+    get_target_property(IS_BUNDLE ${target_exe} MACOSX_BUNDLE)
+    if(IS_BUNDLE)
+      get_filename_component(TARGET_FILE ${OUTPUT_LOCATION} NAME)
+      set(OUTPUT_PATH ${OUTPUT_LOCATION}.app/Contents/MacOS)
+      set(OUTPUT_LOCATION ${OUTPUT_PATH}/${TARGET_FILE})
+    endif(IS_BUNDLE)
+  else(DARWIN)
+    message(FATAL_ERROR "Only darwin currently supported!")
+  endif(DARWIN)
+  
+  add_custom_command(
+    TARGET ${target_exe} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} 
+    ARGS
+    "-DBIN_NAME=\"${OUTPUT_LOCATION}\""
+    "-DSEARCH_DIRS=\"${search_dirs}\""
+    "-DDST_PATH=\"${OUTPUT_PATH}/${dst_path}\""
+    "-P"
+    "${CMAKE_SOURCE_DIR}/cmake/DeploySharedLibs.cmake"
+    )
 
 endmacro(ll_deploy_sharedlibs_command)
 
-- 
cgit v1.2.3


From dbd749d533532368f209c5d5687a38cf9b4f1657 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Fri, 6 Nov 2009 17:57:15 +0000
Subject: DEV-42322 webkit plugin fails to start on linux in mercurial repo

---
 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 9ec23e80ca..1c572ab27f 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -51,6 +51,7 @@ elseif (LINUX)
         QtGui
         QtCore
 
+        jpeg
         fontconfig
         X11
         Xrender
-- 
cgit v1.2.3


From b7d51146344cb2c50828cc4860cd61a90ee6e3c1 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 9 Nov 2009 15:49:15 -0800
Subject: Fix for DEV-41797 - "LL_QUICKTIME_ENABLED is often unset on Windows
 builds"

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

(limited to 'indra/cmake')

diff --git a/indra/cmake/QuickTimePlugin.cmake b/indra/cmake/QuickTimePlugin.cmake
index 8afd8f304c..02f432e3c1 100644
--- a/indra/cmake/QuickTimePlugin.cmake
+++ b/indra/cmake/QuickTimePlugin.cmake
@@ -12,13 +12,13 @@ elseif (WINDOWS)
   set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
       CACHE PATH "Location of the QuickTime SDK.")
 
-  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
+  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient.lib
                PATHS
                ${ARCH_PREBUILT_DIRS_DEBUG}
                "${QUICKTIME_SDK_DIR}\\libraries"
                )
 
-  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
+  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient.lib
                PATHS
                ${ARCH_PREBUILT_DIRS_RELEASE}
                "${QUICKTIME_SDK_DIR}\\libraries"
-- 
cgit v1.2.3