Commits

Anonymous committed d6781e2 Merge
  • Participants
  • Parent commits ab9809c, 0971c94
  • Tags fork to viewer-2-0

Comments (0)

Files changed (2)

 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-*

File indra/llmessage/CMakeLists.txt

 project(llmessage)
 
 include(00-Common)
+include(GoogleMock)
 include(LLAddBuildTest)
 include(LLCommon)
 include(LLMath)
       ${LLVFS_LIBRARIES}
       ${LLMATH_LIBRARIES}
       ${LLCOMMON_LIBRARIES}
+      ${GOOGLEMOCK_LIBRARIES}
       )
 
     LL_ADD_INTEGRATION_TEST(