Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559

1 files changed, 18 insertions, 31 deletions

diff --git a/indra/cmake/ZLIBNG.cmake b/indra/cmake/ZLIBNG.cmake
index 1f46a23d92..5d99cd9709 100644
--- a/indra/cmake/ZLIBNG.cmake
+++ b/indra/cmake/ZLIBNG.cmake
@@ -1,35 +1,22 @@
 # -*- cmake -*-
 
-set(ZLIBNG_FIND_QUIETLY ON)
-set(ZLIBNG_FIND_REQUIRED ON)
-
 include(Prebuilt)
 
-if (USESYSTEMLIBS)
-  include(FindZLIBNG)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(zlib-ng)
-  if (WINDOWS)
-    set(ZLIBNG_LIBRARIES 
-      debug zlib
-      optimized zlib)
-  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,-lz 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(ZLIBNG_PRELOAD_ARCHIVES -Wl,--whole-archive z -Wl,--no-whole-archive)
-    set(ZLIBNG_LIBRARIES z)
-  elseif (DARWIN)
-    set(ZLIBNG_LIBRARIES z)
-  endif (WINDOWS)
-  set(ZLIBNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib-ng)
-endif (USESYSTEMLIBS)
+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 )
+else()
+  target_link_libraries( ll::zlib-ng INTERFACE z )
+endif (WINDOWS)
+
+if( NOT LINUX )
+  target_include_directories( ll::zlib-ng SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/zlib-ng)
+endif()