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 | |
| parent | f07e0d9760053a9814fc410a7c9f0f8192c8bd39 (diff) | |
Fix llmediadataclient test to include new dep on llprimitive and fix bogus boost lib refs in llprimitive cmake def
| -rwxr-xr-x | autobuild.xml | 4 | ||||
| -rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 7 | ||||
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/autobuild.xml b/autobuild.xml index 0559f43d18..910e57d5e3 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -834,9 +834,9 @@ <key>archive</key> <map> <key>hash</key> - <string>98994d5b0b4b3d43be22aa6a5c36e6fa</string> + <string>d2542614df9dd99cbb5ff67e76d4a6c1</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-mock-graham/rev/272961/arch/CYGWIN/installer/gmock-1.6.0-windows-20130327.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-mock/rev/274899/arch/CYGWIN/installer/gmock-1.6.0-windows-20130426.tar.bz2</string> </map> <key>name</key> <string>windows</string> 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 diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index da0dd26913..b9e19389d7 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2118,7 +2118,7 @@ if (LL_TESTS) set_source_files_properties( llmediadataclient.cpp PROPERTIES - LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}" + LL_TEST_ADDITIONAL_LIBRARIES "${LLPRIMITIVE_LIBRARIES}" ) set_source_files_properties( |