Fix multi-config cmake generators only including one config of build-variables and various small cleanup

Author: Rye Cogtail

indra/CMakeLists.txt

@@ -37,7 +37,7 @@ include(BuildVersion)
 
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-      "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
+      "Build type.  One of: Release RelWithDebInfo" FORCE)
 endif (NOT CMAKE_BUILD_TYPE)
 
 add_subdirectory(cmake)

indra/cmake/00-Common.cmake

@@ -11,14 +11,20 @@
 #
 #   Also realize that CMAKE_CXX_FLAGS may already be partially populated on
 #   entry to this file.
+#
+#   Additionally CMAKE_C_FLAGS is prepended to CMAKE_CXX_FLAGS_RELEASE and
+#   CMAKE_CXX_FLAGS_RELWITHDEBINFO which risks having flags overriden by cmake
+#   inserting additional options that are part of the build config type.
 #*****************************************************************************
 include_guard()
 
 include(Variables)
 include(Linker)
 
 # We go to some trouble to set LL_BUILD to the set of relevant compiler flags.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} $ENV{LL_BUILD}")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} $ENV{LL_BUILD_RELEASE}")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} $ENV{LL_BUILD_RELWITHDEBINFO}")
+
 # Given that, all the flags you see added below are flags NOT present in
 # https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables.
 # Before adding new ones here, it's important to ask: can this flag really be

indra/cmake/Audio.cmake

@@ -11,14 +11,10 @@ target_include_directories( ll::vorbis SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/inc
 
 if (WINDOWS)
   target_link_libraries(ll::vorbis INTERFACE
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libogg.lib
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libogg.lib
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisenc.lib
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbisenc.lib
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.lib
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbisfile.lib
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.lib
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbis.lib
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libogg.lib
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisenc.lib
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.lib
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.lib
     )
 else (WINDOWS)
   target_link_libraries(ll::vorbis INTERFACE vorbisfile vorbis ogg vorbisenc )

indra/cmake/EXPAT.cmake

@@ -9,11 +9,9 @@ use_prebuilt_binary(expat)
 if (WINDOWS)
     target_compile_definitions( ll::expat INTERFACE XML_STATIC=1)
     target_link_libraries( ll::expat  INTERFACE
-            debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpatd.lib
-            optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.lib)
+            ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.lib)
 else ()
     target_link_libraries( ll::expat  INTERFACE
-            debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpat.a
-            optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.a)
+            ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.a)
 endif ()
 target_include_directories( ll::expat SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )

indra/cmake/Linking.cmake

@@ -8,7 +8,7 @@ set(ARCH_PREBUILT_DIRS_PLUGINS ${AUTOBUILD_INSTALL_DIR}/plugins)
 set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release)
 set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug)
 
-if (WINDOWS OR DARWIN )
+if (LL_GENERATOR_IS_MULTI_CONFIG)
   # Kludge for older cmake versions, 3.20+ is needed to use a genex in add_custom_command( OUTPUT <var> ... )
   # Using this will work okay-ish, as Debug is not supported anyway. But for property multi config and also
   # ninja support the genex version is preferred.
@@ -23,15 +23,16 @@ if (WINDOWS OR DARWIN )
     set(SYMBOLS_STAGING_DIR ${CMAKE_BINARY_DIR}/symbols/$<IF:$<BOOL:${LL_GENERATOR_IS_MULTI_CONFIG}>,$<CONFIG>,>/${VIEWER_CHANNEL})
   endif()
 
-  if( DARWIN )
-    set( SHARED_LIB_STAGING_DIR ${SHARED_LIB_STAGING_DIR}/Resources)
-  endif()
   set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/$<IF:$<BOOL:${LL_GENERATOR_IS_MULTI_CONFIG}>,$<CONFIG>,>)
-elseif (LINUX)
+else ()
   set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib)
   set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin)
 endif ()
 
+if( DARWIN )
+  set( SHARED_LIB_STAGING_DIR ${SHARED_LIB_STAGING_DIR}/Resources)
+endif()
+
 # Autobuild packages must provide 'release' versions of libraries, but may provide versions for
 # specific build types.  AUTOBUILD_LIBS_INSTALL_DIRS lists first the build type directory and then
 # the 'release' directory (as a default fallback).

indra/cmake/Variables.cmake

@@ -12,14 +12,24 @@
 # Switches set here and in 00-Common.cmake must agree with
 # https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables
 # Reading $LL_BUILD is an attempt to directly use those switches.
-if ("$ENV{LL_BUILD}" STREQUAL "" AND "${LL_BUILD_ENV}" STREQUAL "" )
-  message(FATAL_ERROR "Environment variable LL_BUILD must be set")
-elseif("$ENV{LL_BUILD}" STREQUAL "")
-  set( ENV{LL_BUILD} "${LL_BUILD_ENV}" )
-  message( "Setting ENV{LL_BUILD} to cached variable ${LL_BUILD_ENV}" )
+if ("$ENV{LL_BUILD_RELEASE}" STREQUAL "" AND "${LL_BUILD_RELEASE_ENV}" STREQUAL "" )
+  message(FATAL_ERROR "Environment variable LL_BUILD_RELEASE must be set")
+elseif("$ENV{LL_BUILD_RELEASE}" STREQUAL "")
+  set( ENV{LL_BUILD_RELEASE} "${LL_BUILD_RELEASE_ENV}" )
+  message( "Setting ENV{LL_BUILD_RELEASE} to cached variable ${LL_BUILD_RELEASE_ENV}" )
 else()
-  set( LL_BUILD_ENV "$ENV{LL_BUILD}" CACHE STRING "Save environment" FORCE )
+  set( LL_BUILD_RELEASE_ENV "$ENV{LL_BUILD_RELEASE}" CACHE STRING "Save environment RELEASE" FORCE )
 endif ()
+
+if ("$ENV{LL_BUILD_RELWITHDEBINFO}" STREQUAL "" AND "${LL_BUILD_RELWITHDEBINFO_ENV}" STREQUAL "" )
+  message(FATAL_ERROR "Environment variable LL_BUILD_RELWITHDEBINFO must be set")
+elseif("$ENV{LL_BUILD_RELWITHDEBINFO}" STREQUAL "")
+  set( ENV{LL_BUILD_RELWITHDEBINFO} "${LL_BUILD_RELWITHDEBINFO_ENV}" )
+  message( "Setting ENV{LL_BUILD_RELWITHDEBINFO} to cached variable ${LL_BUILD_RELWITHDEBINFO_ENV}" )
+else()
+  set( LL_BUILD_RELWITHDEBINFO_ENV "$ENV{LL_BUILD_RELWITHDEBINFO}" CACHE STRING "Save environment RELWITHDEBINFO" FORCE )
+endif ()
+
 include_guard()
 
 # Relative and absolute paths to subtrees.
@@ -67,7 +77,7 @@ set(TEMPLATE_VERIFIER_MASTER_URL "https://github.com/secondlife/master-message-t
 
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-      "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
+      "Build type.  One of: Release RelWithDebInfo" FORCE)
 endif (NOT CMAKE_BUILD_TYPE)
 
 # If someone has specified an address size, use that to determine the