livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux: put pcre back to please glib

master
Zi Ree 2024-08-02 19:57:59 +02:00
parent 63f7eb03f7
commit 003aeab948
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
autobuild.xml
View File

@ -2497,6 +2497,38 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>description</key>
<string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
</map>
<key>pcre</key>
<map>
<key>platforms</key>
<map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>3a722c508a9278a49317e3f749f3256768f1c50b</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-pcre/releases/download/v8.35-3c0eb51/pcre-8.35.3c0eb51-linux64-3c0eb51.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
</map>
<key>license</key>
<string>bsd</string>
<key>license_file</key>
<string>LICENSES/pcre-license.txt</string>
<key>copyright</key>
<string>Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.</string>
<key>version</key>
<string>8.35.979fd86</string>
<key>name</key>
<string>pcre</string>
<key>description</key>
<string>PCRE Perl-compatible regular expression library</string>
</map>
<key>slvoice</key>
<map>
<key>platforms</key>

5
indra/cmake/LLPrimitive.cmake
View File

@ -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()

5
indra/llprimitive/CMakeLists.txt
View File

@ -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)