merge with head

BuildParams

@@ -8,6 +8,11 @@ Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2"
 CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2"
 Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2"
 
+build_Debug = false
+build_RelWithDebInfo = false
+build_Darwin_Debug = false
+build_Darwin_RelWithDebInfo = false
+
 # Use Public Upload Locations
 public_build = true
 

autobuild.xml

@@ -2125,8 +2125,6 @@
                 <array>
                   <string>-configuration Release</string>
                   <string>-project SecondLife.xcodeproj</string>
-                  <string>-DENABLE_SIGNING:BOOL=YES</string>
-                  <string>-DSIGNING_IDENTITY:STRING="Developer\ ID\ Application:\ Linden\ Research,\ Inc."</string>
                 </array>
               </map>
               <key>configure</key>
@@ -2155,7 +2153,7 @@
                   <string>-configuration Release</string>
                   <string>-project SecondLife.xcodeproj</string>
                   <string>-DENABLE_SIGNING:BOOL=YES</string>
-                  <string>-DSIGNING_IDENTITY:STRING="Developer\ ID\ Application:\ Linden\ Research,\ Inc."</string>
+                  <string>-DSIGNING_IDENTITY:STRING="Developer ID Application: Linden Research, Inc."</string>
                 </array>
               </map>
               <key>configure</key>

indra/cmake/00-Common.cmake

@@ -206,6 +206,8 @@ if (DARWIN)
   # 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}")
+  set(ENABLE_SIGNING TRUE)
+  set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
 endif (DARWIN)