diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-06-29 20:31:17 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-06-29 20:31:17 +0300 |
| commit | 77ce594dec86eacadb39abf56c69d03b6f421a59 (patch) | |
| tree | 206d5ffc8e7e275929d3dbbe0ef4fd098c8d7ca0 /indra/cmake/LLPrimitive.cmake | |
| parent | 192e7284aa7275f1b4e37bfd639bf317182bb5e2 (diff) | |
| parent | 1e4f2ec07e32a142f35817d3186a124df3f8cd25 (diff) | |
Merge branch 'master' into DRTVWR-544-maint
Diffstat (limited to 'indra/cmake/LLPrimitive.cmake')
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 93626f689f..4e34951215 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 + minizip # for collada libminizip.a xml2 pcrecpp pcre |