From 05fd13f89635e02745f96416bc44785863c19dde Mon Sep 17 00:00:00 2001 From: Rye Mutt Date: Fri, 2 Aug 2024 06:29:28 -0400 Subject: [PATCH] Remove dead pcre library dependency (#2177) --- autobuild.xml | 58 -------------------------------- indra/cmake/LLPrimitive.cmake | 4 --- indra/llprimitive/CMakeLists.txt | 1 - 3 files changed, 63 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 4140f1cb165..f3d14ac2b0d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2202,64 +2202,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors description Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library - pcre - - platforms - - darwin64 - - archive - - hash - b372d37596474043a62568e569b0ce155192f484 - hash_algorithm - sha1 - url - https://github.com/secondlife/3p-pcre/releases/download/v8.35.979fd86/pcre-8.35.979fd86-darwin64-979fd86.tar.zst - - name - darwin64 - - linux64 - - archive - - hash - 0f058ca2176e7d02d51e54c66a96f336 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/908/2010/pcre-8.35.500898-linux64-500898.tar.bz2 - - name - linux64 - - windows64 - - archive - - hash - 166564afb60a7536a038fae80e2fc9a41d6dbccb - hash_algorithm - sha1 - url - https://github.com/secondlife/3p-pcre/releases/download/v8.35.979fd86/pcre-8.35.979fd86-windows64-979fd86.tar.zst - - name - windows64 - - - 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 735f5e80528..1e815325515 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -6,7 +6,6 @@ include(Boost) include_guard() -add_library( ll::pcre INTERFACE IMPORTED ) add_library( ll::minizip-ng INTERFACE IMPORTED ) add_library( ll::libxml INTERFACE IMPORTED ) add_library( ll::colladadom INTERFACE IMPORTED ) @@ -22,11 +21,8 @@ use_system_binary( colladadom ) use_prebuilt_binary(colladadom) use_prebuilt_binary(minizip-ng) # needed for colladadom -use_prebuilt_binary(pcre) use_prebuilt_binary(libxml2) -target_link_libraries( ll::pcre INTERFACE pcrecpp pcre ) - if (WINDOWS) target_link_libraries( ll::minizip-ng INTERFACE libminizip ) else() diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index 972f502aa96..19a43839aff 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -70,7 +70,6 @@ target_link_libraries(llprimitive llrender llphysicsextensions_impl ll::colladadom - ll::pcre ll::glh_linear )