diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-10-20 11:34:46 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-10-20 11:34:46 -0400 |
| commit | aa75245a1aee3b64aeed31744e58fe96afa1ce7e (patch) | |
| tree | 843dbbd193417ddd2f8dd6afd3c8137b4ed3d1a0 /indra/cmake | |
| parent | d9e61b280f834445e30cce65c61455688ba58541 (diff) | |
| parent | 7aff3d0842475de4b0bb3bc33d5b4cc86a056623 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLAddBuildTest.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index 499bf19afd..d8f64199cf 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -1,5 +1,6 @@ # -*- cmake -*- include(LLTestCommand) +include(GoogleMock) MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources) # Given a project name and a list of sourcefiles (with optional properties on each), @@ -190,6 +191,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST SET(libraries ${library_dependencies} + ${GOOGLEMOCK_LIBRARIES} ${PTHREAD_LIBRARY} ) |