diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-23 11:53:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-23 11:53:05 -0400 |
| commit | 9353868d91dfe2c4539c81c0b96bfe9efb497b2c (patch) | |
| tree | f6362bc51afe7fe463718c603ccf756a86079067 /indra/cmake/LLPrimitive.cmake | |
| parent | 5870788f68c6b1fb504ae95403e7da95bc55ed4c (diff) | |
| parent | b4ca93cadce90466d41704b68933c21fe909bcb8 (diff) | |
merge changes for STORM-1831
Diffstat (limited to 'indra/cmake/LLPrimitive.cmake')
| -rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 0d87ff579a..67c2115237 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -6,21 +6,30 @@ include(Boost) use_prebuilt_binary(colladadom) use_prebuilt_binary(pcre) -use_prebuilt_binary(libxml) 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 ${BOOST_SYSTEM_LIBRARIES} ) +elseif (LINUX) + use_prebuilt_binary(libxml2) + set(LLPRIMITIVE_LIBRARIES + llprimitive + collada14dom + minizip + xml2 + pcrecpp + pcre + ) else (WINDOWS) - set(LLPRIMITIVE_LIBRARIES + set(LLPRIMITIVE_LIBRARIES llprimitive collada14dom minizip |