Initialize variables so that calling cmake with "--warn-unused-vars --warn-uninitialized" does

not make it go all crazy.

3 files changed, 25 insertions, 23 deletions

diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index 653d96f86a..334d46caf9 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -34,5 +34,7 @@ if (FMODSTUDIO)
 
     set_target_include_dirs(ll::fmodstudio ${LIBS_PREBUILT_DIR}/include/fmodstudio)
   endif (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
+else()
+  set( FMODSTUDIO "OFF")
 endif (FMODSTUDIO)
 
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index 9e8adf5af1..603368304c 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -23,40 +23,38 @@ endif ("${CMAKE_SOURCE_DIR}/../autobuild.xml" IS_NEWER_THAN "${PREBUILD_TRACKING
 # of previous attempts is serialized in the file
 # ${PREBUILD_TRACKING_DIR}/${_binary}_installed)
 macro (use_prebuilt_binary _binary)
-  if (NOT DEFINED USESYSTEMLIBS_${_binary})
-    set(USESYSTEMLIBS_${_binary} ${USESYSTEMLIBS})
-  endif (NOT DEFINED USESYSTEMLIBS_${_binary})
+    if( NOT DEFINED ${_binary}_installed )
+        set( ${_binary}_installed "")
+    endif()
 
-  if (NOT USESYSTEMLIBS_${_binary})
     if("${${_binary}_installed}" STREQUAL "" AND EXISTS "${PREBUILD_TRACKING_DIR}/${_binary}_installed")
-      file(READ ${PREBUILD_TRACKING_DIR}/${_binary}_installed "${_binary}_installed")
-      if(DEBUG_PREBUILT)
-        message(STATUS "${_binary}_installed: \"${${_binary}_installed}\"")
-      endif(DEBUG_PREBUILT)
+        file(READ ${PREBUILD_TRACKING_DIR}/${_binary}_installed "${_binary}_installed")
+        if(DEBUG_PREBUILT)
+            message(STATUS "${_binary}_installed: \"${${_binary}_installed}\"")
+        endif(DEBUG_PREBUILT)
     endif("${${_binary}_installed}" STREQUAL "" AND EXISTS "${PREBUILD_TRACKING_DIR}/${_binary}_installed")
 
     if(${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/${_binary}_installed OR NOT ${${_binary}_installed} EQUAL 0)
-      if(DEBUG_PREBUILT)
-        message(STATUS "cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install
+        if(DEBUG_PREBUILT)
+            message(STATUS "cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install
         --install-dir=${AUTOBUILD_INSTALL_DIR}
         ${_binary} ")
-      endif(DEBUG_PREBUILT)
-      execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
-        install
-        --install-dir=${AUTOBUILD_INSTALL_DIR}
-        ${_binary}
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-        RESULT_VARIABLE ${_binary}_installed
-        )
-      file(WRITE ${PREBUILD_TRACKING_DIR}/${_binary}_installed "${${_binary}_installed}")
+        endif(DEBUG_PREBUILT)
+        execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
+                install
+                --install-dir=${AUTOBUILD_INSTALL_DIR}
+                ${_binary}
+                WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+                RESULT_VARIABLE ${_binary}_installed
+                )
+        file(WRITE ${PREBUILD_TRACKING_DIR}/${_binary}_installed "${${_binary}_installed}")
     endif(${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/${_binary}_installed OR NOT ${${_binary}_installed} EQUAL 0)
 
     if(NOT ${_binary}_installed EQUAL 0)
-      message(FATAL_ERROR
-              "Failed to download or unpack prebuilt '${_binary}'."
-              " Process returned ${${_binary}_installed}.")
+        message(FATAL_ERROR
+                "Failed to download or unpack prebuilt '${_binary}'."
+                " Process returned ${${_binary}_installed}.")
     endif (NOT ${_binary}_installed EQUAL 0)
-  endif (NOT USESYSTEMLIBS_${_binary})
 endmacro (use_prebuilt_binary _binary)
 
 function( create_target name )
diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake
index ce5660aa05..af2d7bd9f2 100644
--- a/indra/cmake/bugsplat.cmake
+++ b/indra/cmake/bugsplat.cmake
@@ -33,5 +33,7 @@ if (USE_BUGSPLAT)
 
     set_target_include_dirs( ll::bugsplat ${LIBS_PREBUILT_DIR}/include/bugsplat)
     set_property( TARGET ll::bugsplat APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS LL_BUGSPLAT)
+else()
+    set(BUGSPLAT_DB "" CACHE STRING "BugSplat crash database name")
 endif (USE_BUGSPLAT)