diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 07:28:35 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 07:28:35 -0700 |
commit | 37b64c18f5c016edbee97319929bc8ddc4c08762 (patch) | |
tree | c11588f1eb13b4863fbf286390a2d20aa1509c56 /indra/cmake | |
parent | f07e0d9760053a9814fc410a7c9f0f8192c8bd39 (diff) |
Fix llmediadataclient test to include new dep on llprimitive and fix bogus boost lib refs in llprimitive cmake def
Diffstat (limited to 'indra/cmake')
-rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index ab39cbb6be..0d87ff579a 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -2,6 +2,8 @@ # these should be moved to their own cmake file include(Prebuilt) +include(Boost) + use_prebuilt_binary(colladadom) use_prebuilt_binary(pcre) use_prebuilt_binary(libxml) @@ -15,10 +17,7 @@ if (WINDOWS) optimized llprimitive debug libcollada14dom22-d optimized libcollada14dom22 - debug libboost_filesystem-mt-gd - optimized libboost_filesystem-mt - debug libboost_system-mt-gd - optimized libboost_system-mt + ${BOOST_SYSTEM_LIBRARIES} ) else (WINDOWS) set(LLPRIMITIVE_LIBRARIES |