Skip to content
Snippets Groups Projects
Commit 8781b36d authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

SL-821: export BUGSPLAT_DB when loaded so child processes can detect.

Produce CMake message when BugSplat is engaged so we can detect in build log.

Don't try to copy BugSplat DLLs when NOT engaged.
parent 63fe7d80
No related branches found
No related tags found
No related merge requests found
...@@ -110,6 +110,11 @@ pre_build() ...@@ -110,6 +110,11 @@ pre_build()
then # show that we're doing this, just not the contents then # show that we're doing this, just not the contents
echo source "$bugsplat_sh" echo source "$bugsplat_sh"
source "$bugsplat_sh" source "$bugsplat_sh"
# important: we test this and use its value in [grand-]child processes
if [ -n "${BUGSPLAT_DB:-}" ]
then echo export BUGSPLAT_DB
export BUGSPLAT_DB
fi
fi fi
set -x set -x
......
...@@ -51,15 +51,17 @@ if(WINDOWS) ...@@ -51,15 +51,17 @@ if(WINDOWS)
# Filenames are different for 32/64 bit BugSplat file and we don't # Filenames are different for 32/64 bit BugSplat file and we don't
# have any control over them so need to branch. # have any control over them so need to branch.
if(ADDRESS_SIZE EQUAL 32) if (DEFINED ENV{BUGSPLAT_DB})
if(ADDRESS_SIZE EQUAL 32)
set(release_files ${release_files} BugSplat.dll) set(release_files ${release_files} BugSplat.dll)
set(release_files ${release_files} BugSplatRc.dll) set(release_files ${release_files} BugSplatRc.dll)
set(release_files ${release_files} BsSndRpt.exe) set(release_files ${release_files} BsSndRpt.exe)
else(ADDRESS_SIZE EQUAL 32) else(ADDRESS_SIZE EQUAL 32)
set(release_files ${release_files} BugSplat64.dll) set(release_files ${release_files} BugSplat64.dll)
set(release_files ${release_files} BugSplatRc64.dll) set(release_files ${release_files} BugSplatRc64.dll)
set(release_files ${release_files} BsSndRpt64.exe) set(release_files ${release_files} BsSndRpt64.exe)
endif(ADDRESS_SIZE EQUAL 32) endif(ADDRESS_SIZE EQUAL 32)
endif (DEFINED ENV{BUGSPLAT_DB})
if (FMODEX) if (FMODEX)
......
...@@ -3,10 +3,12 @@ ...@@ -3,10 +3,12 @@
# build). # build).
if (DEFINED ENV{BUGSPLAT_DB}) if (DEFINED ENV{BUGSPLAT_DB})
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
message(STATUS "Looking for system BugSplat")
set(BUGSPLAT_FIND_QUIETLY ON) set(BUGSPLAT_FIND_QUIETLY ON)
set(BUGSPLAT_FIND_REQUIRED ON) set(BUGSPLAT_FIND_REQUIRED ON)
include(FindBUGSPLAT) include(FindBUGSPLAT)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
message(STATUS "Engaging autobuild BugSplat")
include(Prebuilt) include(Prebuilt)
use_prebuilt_binary(bugsplat) use_prebuilt_binary(bugsplat)
if (WINDOWS) if (WINDOWS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment