diff options
| author | callum_linden <none@none> | 2012-08-07 14:20:54 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2012-08-07 14:20:54 -0700 |
| commit | b0843fc14a3edd8cab090457f60100b00165e06a (patch) | |
| tree | 8cf81353e1e7771d97ee4766c46112d81e229c0e | |
| parent | b8ccedc8795df40d0c0407ed051068b19fb3a78c (diff) | |
| parent | 9f2b86203a3493f8ed1aad9aa5298a75abacfa86 (diff) | |
merge with head
| -rw-r--r-- | BuildParams | 5 | ||||
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/cmake/00-Common.cmake | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/BuildParams b/BuildParams index 3dd35c5863..037f708a94 100644 --- a/BuildParams +++ b/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 diff --git a/autobuild.xml b/autobuild.xml index bd441f5e5f..17fce69471 100644 --- a/autobuild.xml +++ b/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> diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 00baf626d2..6896d050fb 100644 --- a/indra/cmake/00-Common.cmake +++ b/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) |