diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
| commit | 76876538715e3afbe456e2bf84173bde416d50e6 (patch) | |
| tree | 423b27e9a5ef5c463b066b0fb5a50bda25060869 /indra/cmake/LLAddBuildTest.cmake | |
| parent | 0682e10532e058462d2bb1d5379c55d0e4d757e9 (diff) | |
| parent | 04425000ae60b1fccf4feac1d4d84796d3b6b27d (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/cmake/LLAddBuildTest.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 e8a0a949b6..7c3f1f12e9 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) |