From 5af8f15a0579bc88ca4249324db8b1f19c52bbd5 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 8 Sep 2021 20:53:50 +0300 Subject: SL-14541 Replace zlib with zlib-ng --- indra/cmake/LLPrimitive.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/cmake/LLPrimitive.cmake') diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 93626f689f..91bba98840 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -5,6 +5,7 @@ include(Prebuilt) include(Boost) use_prebuilt_binary(colladadom) +use_prebuilt_binary(minizip-ng) # needed for colladadom use_prebuilt_binary(pcre) use_prebuilt_binary(libxml2) @@ -22,6 +23,8 @@ if (WINDOWS) optimized pcrecpp debug pcred optimized pcre + debug libminizip + optimized libminizip ${BOOST_SYSTEM_LIBRARIES} ) elseif (DARWIN) @@ -29,7 +32,7 @@ elseif (DARWIN) llprimitive debug collada14dom-d optimized collada14dom - minizip + libminizip # for collada xml2 pcrecpp pcre @@ -40,7 +43,7 @@ elseif (LINUX) llprimitive debug collada14dom-d optimized collada14dom - minizip + libminizip xml2 pcrecpp pcre -- cgit v1.2.3 From a6313e90aa3efa83b20850c162f288a3a7f246bd Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 9 Sep 2021 14:52:55 +0300 Subject: SL-14541 MacOS build fix --- indra/cmake/LLPrimitive.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/cmake/LLPrimitive.cmake') diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 91bba98840..4e34951215 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -32,7 +32,7 @@ elseif (DARWIN) llprimitive debug collada14dom-d optimized collada14dom - libminizip # for collada + minizip # for collada libminizip.a xml2 pcrecpp pcre @@ -43,7 +43,7 @@ elseif (LINUX) llprimitive debug collada14dom-d optimized collada14dom - libminizip + minizip xml2 pcrecpp pcre -- cgit v1.2.3