diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-04 13:50:32 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-04 13:50:32 -0500 |
| commit | c9c9943098d35914f7b8591bf66ea1ae3985a94e (patch) | |
| tree | daa74a4288a0e5e5c028717e0b925633c11eac5b /indra/test/CMakeLists.txt | |
| parent | 92a1ecd5fdfff2490cb563e83baff88fc6120882 (diff) | |
| parent | 5b695ac56a7fbbb4d1f63bccb0c147c46e56ebcf (diff) | |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/test/CMakeLists.txt')
| -rw-r--r-- | indra/test/CMakeLists.txt | 4 |
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}" |