diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-04-21 16:43:56 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-04-21 16:43:56 -0400 |
commit | 5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (patch) | |
tree | aff6d5b13b69121919433f80103e0594b3525c9d /indra/cmake/EXPAT.cmake | |
parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
parent | 7a6a2db289581e43c509ca7dfff7d9b72897a10e (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/cmake/EXPAT.cmake')
-rw-r--r-- | indra/cmake/EXPAT.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake index c1155531ff..cddc71b227 100644 --- a/indra/cmake/EXPAT.cmake +++ b/indra/cmake/EXPAT.cmake @@ -10,8 +10,14 @@ else (USESYSTEMLIBS) use_prebuilt_binary(expat) if (WINDOWS) set(EXPAT_LIBRARIES libexpatMT) + set(EXPAT_COPY libexpatMT.dll) else (WINDOWS) set(EXPAT_LIBRARIES expat) + if (DARWIN) + set(EXPAT_COPY libexpat.1.dylib libexpat.dylib) + else () + set(EXPAT_COPY libexpat.so.1 libexpat.so) + endif () endif (WINDOWS) set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (USESYSTEMLIBS) |