diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-13 10:53:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-13 10:53:10 -0400 |
| commit | 7bb74afb67770fb8a02543a5e3a02a9b6d65bc57 (patch) | |
| tree | d12b00a2308b0fe000b2eaeb3529b31eeb0c2762 /indra/cmake | |
| parent | a351c5005eebb03a03f0e79d2efcc5a304fab481 (diff) | |
| parent | 41484c19eeb534330a17aff7e7b6663b86198cfe (diff) | |
Automated merge with ssh://bitbucket.org/merov_linden/viewer-development-storm-137
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLAddBuildTest.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
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) |