diff options
| author | Rye Mutt <rye@alchemyviewer.org> | 2024-08-08 11:57:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-08 18:57:26 +0300 |
| commit | 12cb787f314b690e018d4b12ac54e08570b3b677 (patch) | |
| tree | d4b84340584f9b987bed0148ff928f99446b4df8 /indra/cmake/EXPAT.cmake | |
| parent | 17f7b439d617bfdf4c865f1478ade662e86b61d2 (diff) | |
Update libexpat to 2.6.2 and libapr 1.7.4 (#2214)
Diffstat (limited to 'indra/cmake/EXPAT.cmake')
| -rw-r--r-- | indra/cmake/EXPAT.cmake | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake index 327fe8aa72..1a0b8789dc 100644 --- a/indra/cmake/EXPAT.cmake +++ b/indra/cmake/EXPAT.cmake @@ -7,14 +7,13 @@ add_library( ll::expat INTERFACE IMPORTED ) use_system_binary(expat) use_prebuilt_binary(expat) if (WINDOWS) - target_link_libraries( ll::expat INTERFACE libexpatMT ) - set(EXPAT_COPY libexpatMT.dll) -else (WINDOWS) - target_link_libraries( ll::expat INTERFACE expat ) - if (DARWIN) - set(EXPAT_COPY libexpat.1.dylib libexpat.dylib) - else () - set(EXPAT_COPY libexpat.so.1 libexpat.so) - endif () -endif (WINDOWS) + target_compile_definitions( ll::expat INTERFACE XML_STATIC=1) + target_link_libraries( ll::expat INTERFACE + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpatd.lib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.lib) +else () + target_link_libraries( ll::expat INTERFACE + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpat.a + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.a) +endif () target_include_directories( ll::expat SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include ) |