diff options
| author | Paul Oppenheim <poppy@lindenlab.com> | 2009-06-19 23:24:11 +0000 |
|---|---|---|
| committer | Paul Oppenheim <poppy@lindenlab.com> | 2009-06-19 23:24:11 +0000 |
| commit | 351ebe9fcb76f3b99c2957004bb8493a904869ee (patch) | |
| tree | 611a8bc735d719e8ba742c65614dd99634982b9c /indra/newview | |
| parent | c90c3630ab5c4d002c5c9b0034d19f0d10b1ceff (diff) | |
result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 57f1716db5..0c8486bd4f 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -11,7 +11,6 @@ include(ELFIO) include(FMOD) include(OPENAL) include(FindOpenGL) -include(LLAddBuildTest) include(LLAudio) include(LLCharacter) include(LLCommon) @@ -1393,6 +1392,19 @@ if (INSTALL) include(${CMAKE_CURRENT_SOURCE_DIR}/ViewerInstall.cmake) endif (INSTALL) -ADD_VIEWER_BUILD_TEST(llagentaccess viewer) -ADD_VIEWER_COMM_BUILD_TEST(llcapabilitylistener viewer - ${CMAKE_CURRENT_SOURCE_DIR}/../llmessage/tests/test_llsdmessage_peer.py) +include(LLAddBuildTest) +SET(viewer_TEST_SOURCE_FILES + llagentaccess.cpp + # Not *actually* a unit test, it's an integration test. + # Because it won't work in the new unit test iface, i've commented out + # and notified Nat. Delete this when it's replaced! + # + poppy & brad 2009-06-05 + # llcapabilitylistener.cpp + ) +set_source_files_properties( + ${viewer_TEST_SOURCE_FILES} + PROPERTIES + LL_TEST_ADDITIONAL_SOURCE_FILES llviewerprecompiledheaders.cpp + ) +LL_ADD_PROJECT_UNIT_TESTS(${VIEWER_BINARY_NAME} "${viewer_TEST_SOURCE_FILES}") + |