summaryrefslogtreecommitdiff
path: root/indra/cmake/URIPARSER.cmake
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-03-31 11:39:06 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-03-31 11:39:06 -0400
commit1be9d68468e51be7de5b632f0276dc6708e75dc6 (patch)
treeba80104fa9531a51291d2ad067b23fa75cb58fc9 /indra/cmake/URIPARSER.cmake
parent0dd7b362a6e77d8f3dff450376ddf2d4ffaf752c (diff)
parentc7053a6928fd5eafdc935453742e92951ae4e0c1 (diff)
DRTVWR-573: Merge branch 'main' into fix-monterey
Diffstat (limited to 'indra/cmake/URIPARSER.cmake')
-rw-r--r--indra/cmake/URIPARSER.cmake44
1 files changed, 14 insertions, 30 deletions
diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake
index ecc5b74ef1..6c33ff70e1 100644
--- a/indra/cmake/URIPARSER.cmake
+++ b/indra/cmake/URIPARSER.cmake
@@ -1,35 +1,19 @@
# -*- cmake -*-
-set(URIPARSER_FIND_QUIETLY ON)
-set(URIPARSER_FIND_REQUIRED ON)
+include_guard()
include(Prebuilt)
-if (USESYSTEMLIBS)
- include(FindURIPARSER)
-else (USESYSTEMLIBS)
- use_prebuilt_binary(uriparser)
- if (WINDOWS)
- set(URIPARSER_LIBRARIES
- debug uriparserd
- optimized uriparser)
- elseif (LINUX)
- #
- # When we have updated static libraries in competition with older
- # shared libraries and we want the former to win, we need to do some
- # extra work. The *_PRELOAD_ARCHIVES settings are invoked early
- # and will pull in the entire archive to the binary giving it.
- # priority in symbol resolution. Beware of cmake moving the
- # achive load itself to another place on the link command line. If
- # that happens, you can try something like -Wl,-luriparser here to hide
- # the archive. Also be aware that the linker will not tolerate a
- # second whole-archive load of the archive. See viewer's
- # CMakeLists.txt for more information.
- #
- set(URIPARSER_PRELOAD_ARCHIVES -Wl,--whole-archive uriparser -Wl,--no-whole-archive)
- set(URIPARSER_LIBRARIES uriparser)
- elseif (DARWIN)
- set(URIPARSER_LIBRARIES liburiparser.dylib)
- endif (WINDOWS)
- set(URIPARSER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/uriparser)
-endif (USESYSTEMLIBS)
+add_library( ll::uriparser INTERFACE IMPORTED )
+
+use_system_binary( uriparser )
+
+use_prebuilt_binary(uriparser)
+if (WINDOWS)
+ target_link_libraries( ll::uriparser INTERFACE uriparser)
+elseif (LINUX)
+ target_link_libraries( ll::uriparser INTERFACE uriparser)
+elseif (DARWIN)
+ target_link_libraries( ll::uriparser INTERFACE liburiparser.dylib)
+endif (WINDOWS)
+target_include_directories( ll::uriparser SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/uriparser)