diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-11-15 12:05:05 -0800 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-11-15 12:05:05 -0800 |
| commit | 5bfa6095db3a0a9c7367b7dde3f2e24e023cb7f4 (patch) | |
| tree | 1ab6b0946d7bfb881a2ccfaa2382d24b46a6b729 /indra/cmake/LLAddBuildTest.cmake | |
| parent | 65d847de38614a67ed1bdd86445c1c80f4638cc3 (diff) | |
| parent | c13f6afe73bea4311a91d65dde2f6e1c5bc453b3 (diff) | |
Added viewer-release.release-viewer.jira parameter to write build comment to DRTVWR-13
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 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) |