From 24b2343e83099257dc43bf4f296d58f307adba39 Mon Sep 17 00:00:00 2001 From: Rye Date: Thu, 23 Oct 2025 04:48:17 -0400 Subject: Fix makefile and ninja generators invalidating secondlife-bin target every time cmake is run Signed-off-by: Rye --- indra/newview/llversioninfo.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llversioninfo.cpp') diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp index 4e8320b72a..cbd63184e9 100644 --- a/indra/newview/llversioninfo.cpp +++ b/indra/newview/llversioninfo.cpp @@ -32,6 +32,8 @@ #include "llversioninfo.h" #include "stringize.h" +#include "llversioninfovars.h" + #if ! defined(LL_VIEWER_CHANNEL) \ || ! defined(LL_VIEWER_VERSION_MAJOR) \ || ! defined(LL_VIEWER_VERSION_MINOR) \ -- cgit v1.3 From ed561bfc3c769f8733ad75a70e975d81dcd9d007 Mon Sep 17 00:00:00 2001 From: Rye Date: Sun, 9 Nov 2025 21:08:03 -0500 Subject: Fix failure to generate build config information correctly under some cmake generators due to CMAKE_BUILD_TYPE only being utilized by non-multiconfig Signed-off-by: Rye --- indra/newview/llversioninfo.cpp | 11 +++++++++-- indra/newview/llversioninfo.h | 1 - indra/newview/llversioninfovars.h.in | 1 - 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'indra/newview/llversioninfo.cpp') diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp index cbd63184e9..0fb18c28ae 100644 --- a/indra/newview/llversioninfo.cpp +++ b/indra/newview/llversioninfo.cpp @@ -54,7 +54,6 @@ LLVersionInfo::LLVersionInfo(): // macro expands to the string name of the channel, but without quotes. We // need to turn it into a quoted string. LL_TO_STRING() does that. mWorkingChannelName(LL_TO_STRING(LL_VIEWER_CHANNEL)), - build_configuration(LLBUILD_CONFIG), // set in indra/cmake/BuildVersion.cmake // instantiate an LLEventMailDrop with canonical name to listen for news // from SLVersionChecker mPump{new LLEventMailDrop("relnotes")}, @@ -170,7 +169,15 @@ LLVersionInfo::ViewerMaturity LLVersionInfo::getViewerMaturity() const std::string LLVersionInfo::getBuildConfig() const { - return build_configuration; +#if LL_DEBUG + return "Debug"; +#elif LL_RELEASE_WITH_DEBUG_INFO + return "RelWithDebInfo"; +#elif LL_RELEASE_FOR_DOWNLOAD + return "Release"; +#else + return "Unknown"; +#endif } std::string LLVersionInfo::getReleaseNotes() const diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h index 237b37a084..8c384565e4 100644 --- a/indra/newview/llversioninfo.h +++ b/indra/newview/llversioninfo.h @@ -108,7 +108,6 @@ private: // Storage for the "version and channel" string. // This will get reset too. mutable std::string mVersionChannel; - std::string build_configuration; std::string mReleaseNotes; // Store unique_ptrs to the next couple things so we don't have to explain // to every consumer of this header file all the details of each. diff --git a/indra/newview/llversioninfovars.h.in b/indra/newview/llversioninfovars.h.in index fe834406e6..2984f05bb3 100644 --- a/indra/newview/llversioninfovars.h.in +++ b/indra/newview/llversioninfovars.h.in @@ -28,4 +28,3 @@ #define LL_VIEWER_VERSION_MINOR @VIEWER_VERSION_MINOR@ #define LL_VIEWER_VERSION_PATCH @VIEWER_VERSION_PATCH@ #define LL_VIEWER_VERSION_BUILD @VIEWER_VERSION_REVISION@ -#define LLBUILD_CONFIG "@CMAKE_BUILD_TYPE@" -- cgit v1.3