summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-04-16 19:36:15 +0200
committerNicky <nicky.dasmijn@gmail.com>2022-04-16 19:36:15 +0200
commitddc2c0265dface6cc17eae1c81c9ba246dc57078 (patch)
treeeb9bb284c495396fec43b5dc37ba1069f4f9bbcd /indra
parent1434b4ff96963854c96a7dc5f9d8475a97cc1184 (diff)
slvoice_src_dir seems generally not used/ever valid. Not 100% sure
what's with that, maybe it gets set by LLs teamcity builds?
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 7d187b5eef..79b8c5775a 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -33,7 +33,13 @@ if(WINDOWS)
#*******************************
# VIVOX - *NOTE: no debug version
set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
- set(slvoice_src_dir "${ARCH_PREBUILT_BIN_RELEASE}")
+
+ # ND, it seems there is no such thing defined. At least when building a viewer
+ # Does this maybe matter on some LL buildserver? Otherwise this and the snippet using slvoice_src_dir
+ # can all go
+ if( ARCH_PREBUILT_BIN_RELEASE )
+ set(slvoice_src_dir "${ARCH_PREBUILT_BIN_RELEASE}")
+ endif()
set(slvoice_files SLVoice.exe )
if (ADDRESS_SIZE EQUAL 64)
list(APPEND vivox_libs