summaryrefslogtreecommitdiff
path: root/indra/cmake/Copy3rdPartyLibs.cmake
diff options
context:
space:
mode:
authorjenn <jenn@lindenlab.com>2011-01-18 16:27:35 -0800
committerjenn <jenn@lindenlab.com>2011-01-18 16:27:35 -0800
commit90202a32f8caf7a7e621d69f4315c26f26ff522c (patch)
tree3796ec68dc329872c16aca43aed6684d138377e0 /indra/cmake/Copy3rdPartyLibs.cmake
parent8bc12ce82fa4d7ce8584a6dbc095a0cfe3ae88e3 (diff)
parent19293991b708b90bbe75c86f7a6b0861d741b57a (diff)
Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 2e8bb04db1..9741d4f890 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -155,9 +155,9 @@ elseif(DARWIN)
elseif(LINUX)
# linux is weird, multiple side by side configurations aren't supported
# and we don't seem to have any debug shared libs built yet anyways...
- set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}")
+ set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/debug")
set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}")
- set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}")
+ set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}/release")
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files