diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-10 10:33:13 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-10 10:33:13 -0700 |
| commit | b253069f7e2a99e529caff0319fbcffc77cd5b8d (patch) | |
| tree | 7cf7c352e497a1d79072e7b737db1af8f2483296 | |
| parent | a997e131d4262f0a18a6f4f8c305c73edbfea6b6 (diff) | |
| parent | be7ac8bbfe991427636656ec1679b8119c9d9dbe (diff) | |
Automated merge with http://hg.lindenlab.com/viewer/viewer-20/
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | indra/llmessage/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -24,6 +24,7 @@ indra/newview/res-sdl indra/newview/skins indra/newview/vivox-runtime indra/server-linux-* +indra/test/linden_file.dat indra/test_apps/llmediatest/dependencies/i686-win32 indra/test_apps/terrain_mule/*.dll indra/viewer-linux-* diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index ec52179a39..453286b83d 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -3,6 +3,7 @@ project(llmessage) include(00-Common) +include(GoogleMock) include(LLAddBuildTest) include(LLCommon) include(LLMath) @@ -230,6 +231,7 @@ IF (NOT LINUX AND VIEWER) ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} + ${GOOGLEMOCK_LIBRARIES} ) LL_ADD_INTEGRATION_TEST( |