From 8f77ebbcd9e4814fb19b8875aea1b1cf52a28e75 Mon Sep 17 00:00:00 2001
From: "Boroondas Gupte (patch by Aleric Inglewood)" <hg@boroon.dasgupta.ch>
Date: Tue, 12 Oct 2010 00:39:23 +0200
Subject: [PATCH] SNOW-756 / VWR-23385 FIXED standalone LD_LIBRARY_PATH for
unit tests
Used patch from https://jira.secondlife.com/secure/attachment/41586/SNOW-756-standalone_tests.diff
patching file indra/cmake/LLAddBuildTest.cmake
Hunk #1 succeeded at 259 with fuzz 2 (offset 1 line).
Added entry in doc/contributions.txt. No further changes.
originally commited to Snowglobe 2.1 at http://svn.secondlife.com/trac/linden/changeset/3515
---
doc/contributions.txt | 1 +
indra/cmake/LLAddBuildTest.cmake | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8c6bd5e0fea..1dd1ef369b3 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -58,6 +58,7 @@ Aimee Trescothick
Alejandro Rosenthal
VWR-1184
Aleric Inglewood
+ SNOW-756
VWR-10001
VWR-10759
VWR-10837
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index e0c0ae22468..d0f21a1e385 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -257,7 +257,11 @@ MACRO(SET_TEST_LIST LISTVAR)
set(${LISTVAR} ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources ${SHARED_LIB_STAGING_DIR}/Release/Resources /usr/lib)
ELSE(WINDOWS)
# Linux uses a single staging directory anyway.
- set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib)
+ IF (STANDALONE)
+ set(${LISTVAR} ${CMAKE_BINARY_DIR}/llcommon /usr/lib /usr/local/lib)
+ ELSE (STANDALONE)
+ set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib)
+ ENDIF (STANDALONE)
ENDIF(WINDOWS)
ENDMACRO(SET_TEST_LIST)
--
GitLab