From 0745f8c887ab09226f952dbf92806d0c990d8e1b Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 1 May 2020 05:24:32 -0400
Subject: [PATCH] Fix cmake bug
---
indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
indra/cmake/Linking.cmake | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index da5143631a0..e3d7d02fc88 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -18,7 +18,7 @@ if(WINDOWS)
#*******************************
# VIVOX - *NOTE: no debug version
set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
- set(slvoice_src_dir "${ARCH_PREBUILT_BIN_RELEASE}")
+ set(slvoice_src_dir "${ARCH_PREBUILT_BIN_DIRS_RELEASE}")
set(slvoice_files SLVoice.exe )
if (ADDRESS_SIZE EQUAL 64)
list(APPEND vivox_libs
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 3cb235a9d58..4028a3f7a62 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -9,6 +9,9 @@ set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib)
set(ARCH_PREBUILT_DIRS_PLUGINS ${AUTOBUILD_INSTALL_DIR}/plugins)
set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release)
set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug)
+set(ARCH_PREBUILT_BIN_DIRS ${AUTOBUILD_INSTALL_DIR}/bin)
+set(ARCH_PREBUILT_BIN_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/bin/release)
+set(ARCH_PREBUILT_BIN_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/bin/debug)
if (WINDOWS)
set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
--
GitLab