summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-12-03 12:00:20 -0500
committerNat Goodspeed <nat@lindenlab.com>2009-12-03 12:00:20 -0500
commit57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (patch)
tree200784e3efaf021b25e4281b1b4241a0942657bf /indra/test
parent1b8b6830b71731dda18b9241ce6a50ba63552960 (diff)
Resync indra/test's LD_LIBRARY_PATH with ADD_INTEGRATION_TEST
Diffstat (limited to 'indra/test')
-rw-r--r--indra/test/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index cc9fa598f2..c1360987a5 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -119,8 +119,10 @@ get_target_property(TEST_EXE test LOCATION)
IF(WINDOWS)
set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR})
+ELSEIF(DARWIN)
+ set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources:/usr/lib)
ELSE(WINDOWS)
- set(LD_LIBRARY_PATH ${ARCH_PREBUILT_DIRS}:${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}:/usr/lib)
+ set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}:/usr/lib)
ENDIF(WINDOWS)
LL_TEST_COMMAND("${LD_LIBRARY_PATH}"