summaryrefslogtreecommitdiff
path: root/indra/cmake/EXPAT.cmake
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-02-03 09:54:52 -0500
committerNat Goodspeed <nat@lindenlab.com>2017-02-03 09:54:52 -0500
commit434f0e161aa7b378ff16d526e104e580ba367ab2 (patch)
treea7eed0bd6d7278fa63c362fb7ddb4789d7408705 /indra/cmake/EXPAT.cmake
parent080744d8990e6b18a80858803a20a5ec87020d82 (diff)
parentf40bd0fac308b21319d84ee221cb8f81d369dd71 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/cmake/EXPAT.cmake')
-rw-r--r--indra/cmake/EXPAT.cmake6
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)