diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-08-24 09:56:56 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-08-24 09:56:56 -0400 |
| commit | c2178bb6ac139d47eb2bfdf9e85811a6f02810ed (patch) | |
| tree | 7e0bbb76c709e3982a5451e378becee351766cbf /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | e674f11757ab55c5ca7aab4cb1c8e059fa98f466 (diff) | |
DRTVWR-447: Introduce explicit CMake BUGSPLAT_DB variable.
Define the CMake cache variable, with empty string as its default.
Make build.sh pass the BUGSPLAT_DB environment variable as a CMake
command-line variable assignment.
Change CMake 'if (DEFINED ENV{BUGSPLAT_DB})' to plain 'if (BUGSPLAT_DB)'.
Make CMake pass new --bugsplat switch to every one of SIX different
invocations of viewer_manifest.py.
Give llmanifest.main() function an argument to allow supplementing the base
set of command-line switches with additional application-specific switches.
In viewer_manifest.py, define new --bugsplat command-line switch and pass to
llmanifest.main(). Instead of consulting os.environ['BUGSPLAT_DB'], consult
self.args['bugsplat'].
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index c9519b0e1d..dde53835fb 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -51,7 +51,7 @@ if(WINDOWS) # Filenames are different for 32/64 bit BugSplat file and we don't # have any control over them so need to branch. - if (DEFINED ENV{BUGSPLAT_DB}) + if (BUGSPLAT_DB) if(ADDRESS_SIZE EQUAL 32) set(release_files ${release_files} BugSplat.dll) set(release_files ${release_files} BugSplatRc.dll) @@ -61,7 +61,7 @@ if(WINDOWS) set(release_files ${release_files} BugSplatRc64.dll) set(release_files ${release_files} BsSndRpt64.exe) endif(ADDRESS_SIZE EQUAL 32) - endif (DEFINED ENV{BUGSPLAT_DB}) + endif (BUGSPLAT_DB) if (FMODEX) |