diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-04 13:51:50 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-04 13:51:50 -0400 |
| commit | 47e547fcba802af3145f06fa5b8aa9af2942d294 (patch) | |
| tree | 4900ebb4472b101bf6acdd8a0627cd055b3a10c7 /indra/cmake | |
| parent | 0ac96fd8e61e402840bf2788ed4f34487f780567 (diff) | |
DEV-34837: Allow Mac SL executable to find libllcommon.dylib in app bundle's
Resources subdir without requiring user to explicitly set DYLD_LIBRARY_PATH.
Engage the SHARED_LIB_STAGING_DIR mechanism for Mac as well as Windows and
Linux so unit-test executables, too, can find libllcommon.dylib. Perform the
POST_BUILD copy of libllcommon.dylib to SHARED_LIB_STAGING_DIR everywhere but
Windows -- but make it conditional on SHARED_LIB_STAGING_DIR.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Linking.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 30b3cc9994..1f3553539f 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -19,6 +19,7 @@ if (NOT STANDALONE) set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release) set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE}) + set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged DLLs") endif (WINDOWS) endif (NOT STANDALONE) |