diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-04-18 18:11:43 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-04-18 18:11:43 +0200 |
| commit | 2b151e0aefd54671e1be504269f10318d303dccb (patch) | |
| tree | c1527ef5d23bc946ac8dfcb907d2678a9a96db79 /indra/cmake/ZLIBNG.cmake | |
| parent | dcfb94fbaca3c66ec02e6873cda53b4afd547beb (diff) | |
Round one to support conan for 3P packages, this allows to build the viewer on Linux again.
Diffstat (limited to 'indra/cmake/ZLIBNG.cmake')
| -rw-r--r-- | indra/cmake/ZLIBNG.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/cmake/ZLIBNG.cmake b/indra/cmake/ZLIBNG.cmake index a1a1860bc6..5d99cd9709 100644 --- a/indra/cmake/ZLIBNG.cmake +++ b/indra/cmake/ZLIBNG.cmake @@ -5,6 +5,11 @@ include(Prebuilt) include_guard() add_library( ll::zlib-ng INTERFACE IMPORTED ) +if(USE_CONAN ) + target_link_libraries( ll::zlib-ng INTERFACE CONAN_PKG::zlib ) + return() +endif() + use_prebuilt_binary(zlib-ng) if (WINDOWS) target_link_libraries( ll::zlib-ng INTERFACE zlib ) |