diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
| commit | 53495d74ee380d492cfed0af91f7660f49619a9f (patch) | |
| tree | 5992e4769c9acbecc900710048a8eeb4a7806ae4 /indra/cmake/LLPrimitive.cmake | |
| parent | 2365dbcd459b37942ddacbcb7010232113a126c1 (diff) | |
| parent | c02702f3871979cb7745b49aa502ac3c71f77681 (diff) | |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
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) + |