diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-08-22 11:41:18 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-08-22 11:41:18 -0700 |
| commit | 4b2ba7236f4af762faec138d920e90f12d332b06 (patch) | |
| tree | db848fd4e714a615c1c1e16d9409016b8f70966a /indra/newview/CMakeLists.txt | |
| parent | 7b09592bf9968dfda5c4cedf4b55e0459e6bd764 (diff) | |
| parent | c8712fb180aedf84dc48ade636ec0aae8d905bf7 (diff) | |
Merge from viewer-experience
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f13e435a74..6fc7e51ca2 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1798,15 +1798,15 @@ if (LINUX) set(product SecondLife-${ARCH}-${viewer_VERSION}) # These are the generated targets that are copied to package/ - set(COPY_INPUT_DEPENDENCIES - ${VIEWER_BINARY_NAME} - linux-crash-logger - linux-updater - SLPlugin - media_plugin_webkit - media_plugin_gstreamer010 - llcommon - ) + set(COPY_INPUT_DEPENDENCIES + ${VIEWER_BINARY_NAME} + linux-crash-logger + linux-updater + SLPlugin + media_plugin_webkit + media_plugin_gstreamer010 + llcommon + ) add_custom_command( OUTPUT ${product}.tar.bz2 @@ -2055,24 +2055,24 @@ if (LL_TESTS) LL_ADD_INTEGRATION_TEST(llslurl - "${llslurl_test_sources}" + "${llslurl_test_sources}" "${test_libs}" - ) + ) LL_ADD_INTEGRATION_TEST(llviewernetwork - llviewernetwork.cpp + llviewernetwork.cpp "${test_libs}" - ) + ) LL_ADD_INTEGRATION_TEST(llsimplestat "" "${test_libs}" - ) + ) LL_ADD_INTEGRATION_TEST(llviewerassetstats llviewerassetstats.cpp "${test_libs}" - ) + ) #ADD_VIEWER_BUILD_TEST(llmemoryview viewer) #ADD_VIEWER_BUILD_TEST(llagentaccess viewer) |