From 701e76557ae6a6cd7f4b18ee275ee122b91495a8 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 8 Sep 2011 21:03:06 -0700
Subject: Don't run vstool.exe when using an express version of vc++, by
 CobraElDiablo from the Astra Viewer

---
 linden/indra/develop.py             |  6 +++++-
 linden/indra/newview/CMakeLists.txt | 24 +++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 6d2ce72..8b23b1d 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -80,6 +80,7 @@ class PlatformSetup(object):
     project_name = 'Imprudence'
     distcc = True
     cmake_opts = []
+    using_express = False
 
     def __init__(self):
         self.script_dir = os.path.realpath(
@@ -494,6 +495,7 @@ class WindowsSetup(PlatformSetup):
                 for version in 'vc80 vc90 vc100 vc71'.split():
                     if self.find_visual_studio_express(version):
                         self._generator = version
+                        self.using_express = True
                         print 'Building with ', self.gens[version]['gen'] , "Express edition"
                         break
                 else:
@@ -570,6 +572,7 @@ class WindowsSetup(PlatformSetup):
             key = _winreg.OpenKey(reg, key_str)
             value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
             print 'Found: %s' % value
+            self.using_express = True
             return value
         except WindowsError, err:
             print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
@@ -618,7 +621,8 @@ class WindowsSetup(PlatformSetup):
         '''Override to add the vstool.exe call after running cmake.'''
         PlatformSetup.run_cmake(self, args)
         if self.unattended == 'OFF':
-            self.run_vstool()
+            if self.using_express == False:
+                self.run_vstool()
 
     def run_vstool(self):
         for build_dir in self.build_dirs():
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1b9f75a..54c1998 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1323,17 +1323,19 @@ if (WINDOWS)
 
     # sets the 'working directory' for debugging from visual studio.
     if (NOT UNATTENDED)
-        add_custom_command(
-            TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
-            COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
-            ARGS
-              --solution 
-              ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
-              --workingdir
-              ${VIEWER_BINARY_NAME}
-              ${CMAKE_CURRENT_SOURCE_DIR}
-            COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
-            )
+		if (NOT self.using_express)
+			add_custom_command(
+				TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
+				COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
+				ARGS
+				  --solution 
+				  ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
+				  --workingdir
+				  ${VIEWER_BINARY_NAME}
+				  ${CMAKE_CURRENT_SOURCE_DIR}
+				COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
+				)
+		endif (NOT self.using_express)
     endif (NOT UNATTENDED)
 
     add_custom_command(
-- 
cgit v1.1