diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-12 17:26:50 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-12 17:26:50 +0200 |
| commit | f36085b0de9c3c557fd33492312abbbbea6e26a2 (patch) | |
| tree | f3224bd989637871baba7c51bf8f1f26534a35a4 | |
| parent | a8fbfa40ba6153668e1f713ae0e128224b4f400f (diff) | |
| parent | e26f812e0d7edb2b50cc94e27f822ebe94a3647a (diff) | |
merged SNOW-756 / VWR-23385 / STORM-374 (fixed standalone LD_LIBRARY_PATH for unit tests)
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/cmake/LLAddBuildTest.cmake | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index d179c0fb8c..9dabfca161 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -62,6 +62,7 @@ Alejandro Rosenthal VWR-1184 Aleric Inglewood SNOW-522 + SNOW-756 SNOW-764 VWR-10001 VWR-10759 diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index a6a7989955..79c3bb7da2 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -256,6 +256,10 @@ MACRO(SET_TEST_PATH 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_PATH) |