diff --git a/.hgignore b/.hgignore
index 61c38705f441ce6f476df5822638681ef03bfb74..15fb913653871276a35f317365c8b0dc587c0b4c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -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 ec52179a39d910a09f8c8e55a419edbb2396d592..453286b83d8ff019940c1db7d6a3c9b65bceb93a 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(