From b5fef75dad1c0992c63ede83b96da0b1db1f9a37 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Thu, 9 Jul 2009 17:03:20 -0700
Subject: Moveing around DLL copying to support building llcommon.dll and using
 llcommon.dll while running unit tests.

---
 indra/newview/CMakeLists.txt     | 22 +++++++++++++++++-----
 indra/newview/viewer_manifest.py | 12 +++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 53a59031ed..d6108ab06e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -38,10 +38,6 @@ include(LLKDU)
 include(ViewerMiscLibs)
 include(LLLogin)
 
-if (WINDOWS)
-    include(CopyWinLibs)
-endif (WINDOWS)
-
 include_directories(
     ${DBUSGLIB_INCLUDE_DIRS}
     ${ELFIO_INCLUDE_DIR}
@@ -1252,7 +1248,23 @@ if (WINDOWS)
         COMMENT "Copying message.xml to the runtime folder."
         )
        
-    add_dependencies(${VIEWER_BINARY_NAME} copy_win_libs)
+	if(WINDOWS)
+      # Copy Win Libs...
+	  # This happens at build time, not config time. We can't glob files in this cmake.
+	  # *FIX:Mani Write a sub script to glob the files...
+	  add_custom_command(
+        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS
+          -E
+          copy_directory
+          ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}
+         ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
+        COMMENT "Copying staged dlls."
+		)
+	endif(WINDOWS)
+	
+	
 
     if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
       add_dependencies(${VIEWER_BINARY_NAME} copy_win_scripts)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 7edf0bad6b..0217c8f864 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -168,9 +168,8 @@ class WindowsManifest(ViewerManifest):
 
         # need to get the llcommon.dll from any of the build directories as well
         try:
-            self.path(self.find_existing_file('../llcommon/%s/llcommon.dll' % self.args['configuration']),
-                  dst='llcommon.dll')
             if self.prefix(src=self.args['configuration'], dst=""):
+                self.path('llcommon.dll')
                 self.path('libapr-1.dll')
                 self.path('libaprutil-1.dll')
                 self.path('libapriconv-1.dll')
@@ -181,8 +180,7 @@ class WindowsManifest(ViewerManifest):
 
         # need to get the kdu dll from any of the build directories as well
         try:
-            self.path(self.find_existing_file('../llkdu/%s/llkdu.dll' % self.args['configuration'],
-                '../../libraries/i686-win32/lib/release/llkdu.dll'), 
+            self.path(self.find_existing_file('%s/llkdu.dll' % self.args['configuration']), 
                   dst='llkdu.dll')
             pass
         except:
@@ -394,7 +392,11 @@ class WindowsManifest(ViewerManifest):
 
         # We use the Unicode version of NSIS, available from
         # http://www.scratchpaper.com/
-        NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe'
+        # Check two paths, one for Program Files, and one for Program Files (x86).
+        # Yay 64bit windows.
+        NSIS_path = os.path.expandvars('${ProgramFiles}\\NSIS\\Unicode\\makensis.exe')
+        if not os.path.exists(NSIS_path):
+            NSIS_path = os.path.expandvars('${ProgramFiles(x86)}\\NSIS\\Unicode\\makensis.exe')
         self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
         # self.remove(self.dst_path_of(tempfile))
         # If we're on a build machine, sign the code using our Authenticode certificate. JC
-- 
cgit v1.2.3


From 82eb18fce5c3d21a49a299ee5e454cbcc9d6f559 Mon Sep 17 00:00:00 2001
From: "palmer@945battery-guestB-224.lindenlab.com"
 <palmer@945battery-guestB-224.lindenlab.com>
Date: Fri, 10 Jul 2009 11:09:54 -0700
Subject: Expanded tabs in cmake files

---
 indra/newview/CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index d6108ab06e..aece574eed 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1248,11 +1248,11 @@ if (WINDOWS)
         COMMENT "Copying message.xml to the runtime folder."
         )
        
-	if(WINDOWS)
+    if(WINDOWS)
       # Copy Win Libs...
-	  # This happens at build time, not config time. We can't glob files in this cmake.
-	  # *FIX:Mani Write a sub script to glob the files...
-	  add_custom_command(
+      # This happens at build time, not config time. We can't glob files in this cmake.
+      # *FIX:Mani Write a sub script to glob the files...
+      add_custom_command(
         TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
         COMMAND ${CMAKE_COMMAND}
         ARGS
@@ -1261,10 +1261,10 @@ if (WINDOWS)
           ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}
          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
         COMMENT "Copying staged dlls."
-		)
-	endif(WINDOWS)
-	
-	
+        )
+    endif(WINDOWS)
+    
+    
 
     if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
       add_dependencies(${VIEWER_BINARY_NAME} copy_win_scripts)
-- 
cgit v1.2.3