diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-27 15:20:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-27 15:20:27 -0500 |
| commit | 7c2b9221d6678ea7a04f529efaa2e557abce504d (patch) | |
| tree | ba0095eaad5cd0e95577051222953e4c773beac4 /indra/cmake/LLPrimitive.cmake | |
| parent | e6688f993f82d2683e3eadce96c893959c94be2d (diff) | |
| parent | db85c5b327f872ba321f66726fb05b4b3c3af883 (diff) | |
merge
Diffstat (limited to 'indra/cmake/LLPrimitive.cmake')
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index d397b78f1c..9f8d99a0bf 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -1,7 +1,27 @@ # -*- cmake -*- +# these should be moved to their own cmake file +include(Prebuilt) +use_prebuilt_binary(colladadom) +use_prebuilt_binary(pcre) +use_prebuilt_binary(libxml) + set(LLPRIMITIVE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llprimitive ) -set(LLPRIMITIVE_LIBRARIES llprimitive) +if (WINDOWS) + set(LLPRIMITIVE_LIBRARIES + llprimitive + libcollada14dom21 + ) +else (WINDOWS) + set(LLPRIMITIVE_LIBRARIES + llprimitive + collada14dom + xml2 + pcrecpp + pcre + ) +endif (WINDOWS) + |