diff --git a/autobuild.xml b/autobuild.xml index 2f6b698b94..31b91a94d2 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2497,6 +2497,38 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors description Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library + pcre + + platforms + + linux64 + + archive + + hash + 3a722c508a9278a49317e3f749f3256768f1c50b + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-pcre/releases/download/v8.35-3c0eb51/pcre-8.35.3c0eb51-linux64-3c0eb51.tar.zst + + name + linux64 + + + license + bsd + license_file + LICENSES/pcre-license.txt + copyright + Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc. + version + 8.35.979fd86 + name + pcre + description + PCRE Perl-compatible regular expression library + slvoice platforms diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 1e81532551..9ebb25118e 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -44,5 +44,10 @@ if (WINDOWS) elseif (DARWIN) target_link_libraries(ll::colladadom INTERFACE collada14dom ll::libxml ll::minizip-ng) elseif (LINUX) + # GLIB uses pcre, so we need to keep it for Linux + add_library( ll::pcre INTERFACE IMPORTED ) + use_prebuilt_binary(pcre) + target_link_libraries( ll::pcre INTERFACE pcrecpp pcre ) + target_link_libraries(ll::colladadom INTERFACE collada14dom ll::libxml ll::minizip-ng) endif() diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index fe7895ba67..c4f57399c2 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -74,6 +74,11 @@ target_link_libraries(llprimitive ll::glh_linear ) +if(LINUX) + # GLIB uses pcre, so we need to keep it for Linux + target_link_libraries(ll::pcre) +endif(LINUX) + #add unit tests if (LL_TESTS) INCLUDE(LLAddBuildTest)