diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-08-28 12:36:08 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-08-28 12:36:08 -0700 |
| commit | 6122b8769e92ffc10dbde002873707136f674ffc (patch) | |
| tree | 5edb974edd603958dbf9cc91a3d143d4efc7da99 /indra/cmake/LLPrimitive.cmake | |
| parent | 634d495734ffb57a116dfe1da240d847470d7aa0 (diff) | |
| parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) | |
Pull merge from viewer-release
Diffstat (limited to 'indra/cmake/LLPrimitive.cmake')
| -rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 67c2115237..93626f689f 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -6,32 +6,40 @@ include(Boost) use_prebuilt_binary(colladadom) use_prebuilt_binary(pcre) +use_prebuilt_binary(libxml2) set(LLPRIMITIVE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llprimitive ) if (WINDOWS) - set(LLPRIMITIVE_LIBRARIES + set(LLPRIMITIVE_LIBRARIES debug llprimitive optimized llprimitive - debug libcollada14dom22-d - optimized libcollada14dom22 + debug libcollada14dom23-sd + optimized libcollada14dom23-s + libxml2_a + debug pcrecppd + optimized pcrecpp + debug pcred + optimized pcre ${BOOST_SYSTEM_LIBRARIES} ) -elseif (LINUX) - use_prebuilt_binary(libxml2) - set(LLPRIMITIVE_LIBRARIES +elseif (DARWIN) + set(LLPRIMITIVE_LIBRARIES llprimitive - collada14dom + debug collada14dom-d + optimized collada14dom minizip xml2 pcrecpp pcre + iconv # Required by libxml2 ) -else (WINDOWS) - set(LLPRIMITIVE_LIBRARIES +elseif (LINUX) + set(LLPRIMITIVE_LIBRARIES llprimitive - collada14dom + debug collada14dom-d + optimized collada14dom minizip xml2 pcrecpp |