summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-01-04 14:15:54 -0500
committerNat Goodspeed <nat@lindenlab.com>2017-01-04 14:15:54 -0500
commit052900045255ce903f081fd8b3d0f619f34df087 (patch)
tree843088e13de4d310b79acaaa51f753c8d6a6b70c /build.sh
parent24d2c4ae489f21271a6b134abd3c9f78af887ed9 (diff)
DRTVWR-418: Set signing CMake switches in build.sh for proper quoting.
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index ee59892908..5d774fe7e5 100755
--- a/build.sh
+++ b/build.sh
@@ -98,9 +98,14 @@ pre_build()
# nat 2016-12-20: disable HAVOK on Mac until we get a 64-bit Mac build.
# nat 2016-12-21: disable generate_breakpad_symbols.py on Mac until we
# figure out why it's breaking.
+ SIGNING=()
if [ "$arch" == "Darwin" ]
then HAVOK=OFF
RELEASE_CRASH_REPORTING=OFF
+ if [ "$variant" == "Release" ]
+ then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
+ "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
+ fi
else HAVOK=ON
RELEASE_CRASH_REPORTING=ON
fi
@@ -114,7 +119,7 @@ pre_build()
-DGRID:STRING="\"$viewer_grid\"" \
-DLL_TESTS:BOOL="$run_tests" \
-DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \
- $autobuild_configure_parameters \
+ "${SIGNING[@]}"
|| fatal "$variant configuration failed"
end_section "Configure $variant"