From 9e69702fe74f8107e6ac2ee800f234f8a956a781 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Thu, 5 Nov 2009 08:52:07 -0800
Subject: Added calls to ll_deploy_sharedlibs_command Using viewer_manifest.py
 for windows dependency deployment during build. Added SHARED_LIBS_REL_PATH
 var to cmake cache.

---
 indra/win_updater/CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/win_updater/CMakeLists.txt')

diff --git a/indra/win_updater/CMakeLists.txt b/indra/win_updater/CMakeLists.txt
index dedb7cfcc7..9e18555ea9 100644
--- a/indra/win_updater/CMakeLists.txt
+++ b/indra/win_updater/CMakeLists.txt
@@ -33,3 +33,9 @@ set_target_properties(windows-updater
     LINK_FLAGS "/NODEFAULTLIB:LIBCMT"
     LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
     )
+
+# The windows-updater
+#ll_deploy_sharedlibs_command(
+#  windows-updater
+#  "${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}" 
+#  ".") 
-- 
cgit v1.2.3


From ec32310c8602bf4dc69ed27e8c177cbd32c24411 Mon Sep 17 00:00:00 2001
From: palange <palange@lindenlab.com>
Date: Thu, 5 Nov 2009 17:51:50 -0800
Subject: Removed search_dirs and dst_path arguments from
 ll_deploy_sharedlibs_command() Fixed mac breakage.

---
 indra/win_updater/CMakeLists.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'indra/win_updater/CMakeLists.txt')

diff --git a/indra/win_updater/CMakeLists.txt b/indra/win_updater/CMakeLists.txt
index 9e18555ea9..82347adf20 100644
--- a/indra/win_updater/CMakeLists.txt
+++ b/indra/win_updater/CMakeLists.txt
@@ -34,8 +34,5 @@ set_target_properties(windows-updater
     LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
     )
 
-# The windows-updater
-#ll_deploy_sharedlibs_command(
-#  windows-updater
-#  "${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}" 
-#  ".") 
+# The windows-updater doesn't link against anything non-system, apparently
+#ll_deploy_sharedlibs_command(windows-updater)
\ No newline at end of file
-- 
cgit v1.2.3