diff options
| author | callum_linden <none@none> | 2018-01-19 16:39:07 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-01-19 16:39:07 -0800 |
| commit | bdd7bdf390775860fb26a6c7d0923f45bb20256c (patch) | |
| tree | d752db2fb3061297b70c7fc11ef5e5ea3c733a0a /indra/cmake | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
| parent | d4b446dbddda929cff6f83c276be3232f4350cac (diff) | |
After reforking the post-viewer64, viewer-release repository, I pulled in all the changes from my viewer64 based viewe64-bugsplat repository. This repository is the canonical one going forwards
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 12 | ||||
| -rw-r--r-- | indra/cmake/bugsplat.cmake | 20 |
2 files changed, 32 insertions, 0 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index ce9f005e9f..c98d806b98 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -42,6 +42,18 @@ if(WINDOWS) libhunspell.dll ) + # Filenames are different for 32/64 bit BugSplat file and we don't + # have any control over them so need to branch. + if(ADDRESS_SIZE EQUAL 32) + set(release_files ${release_files} BugSplat.dll) + set(release_files ${release_files} BugSplatRc.dll) + set(release_files ${release_files} BsSndRpt.exe) + else(ADDRESS_SIZE EQUAL 32) + set(release_files ${release_files} BugSplat64.dll) + set(release_files ${release_files} BugSplatRc64.dll) + set(release_files ${release_files} BsSndRpt64.exe) + endif(ADDRESS_SIZE EQUAL 32) + if (FMODEX) if(ADDRESS_SIZE EQUAL 32) diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake new file mode 100644 index 0000000000..e993979902 --- /dev/null +++ b/indra/cmake/bugsplat.cmake @@ -0,0 +1,20 @@ +include(Prebuilt) + +set(BUGSPLAT_FIND_QUIETLY ON) +set(BUGSPLAT_FIND_REQUIRED ON) + +if (USESYSTEMLIBS) + include(FindBUGSPLAT) +else (USESYSTEMLIBS) + use_prebuilt_binary(bugsplat) + if (WINDOWS) + set(BUGSPLAT_LIBRARIES + ${ARCH_PREBUILT_DIRS_RELEASE}/bugsplat.lib + ) + elseif (DARWIN) + + else (WINDOWS) + + endif (WINDOWS) + set(BUGSPLAT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/bugsplat) +endif (USESYSTEMLIBS) |