diff options
| author | Tofu Buzzard <no-email> | 2010-10-15 09:52:11 +0100 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-10-15 09:52:11 +0100 |
| commit | ad033a4b35387a343f2204cda64ecb590888b60e (patch) | |
| tree | 6b2191d8e082bc84e28b2bbaa4dcea95cf68a797 /indra/cmake/LLAddBuildTest.cmake | |
| parent | 393c819477b268aa0a05ec0a006e1dba27d6e6c6 (diff) | |
| parent | 508686047d5e98934d5fefbb576e54f108df6fe3 (diff) | |
sync up to viewer-developer
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) |