From 3fcfa778aeb33c885a6202fc980932a0cdaffd61 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 30 Jun 2022 15:09:14 +0200 Subject: [PATCH] Handle variables for OSX signing a bit more graceful and do't force them right into the cache. See https://alexreinking.com/blog/how-to-use-cmake-without-the-agonizing-pain-part-2.html --- indra/cmake/Variables.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 756c3f4f42..6f48f36ecc 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -217,8 +217,12 @@ set(FLICKR_API_SECRET "846f0958020b553e") # Discord client key. set(DDISCORD_API_KEY "427641535253708801") -set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer") -set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.") +# FS:ND Don't force this into the cache, that can have some strange effects. Instead make it a normal variable +#set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer") +set(ENABLE_SIGNING OFF) + +# FS:ND Don't force this into the cache here, we set it in 00-Common.make +#set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.") set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside") set(USESYSTEMLIBS OFF CACHE BOOL "Use libraries from your system rather than Linden-supplied prebuilt libraries.")