diff options
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index 73140e60e4..3fa6454255 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -230,4 +230,11 @@ IF (NOT LINUX AND VIEWER) ) LL_ADD_PROJECT_UNIT_TESTS(llmessage "${llmessage_TEST_SOURCE_FILES}") +<<<<<<< local + # Commented out - see rationale at bottom of newview's build file + poppy 2009-06-05 + # Don't make llmessage depend on llsdmessage_test because ADD_COMM_BUILD_TEST depends on llmessage! + # ADD_COMM_BUILD_TEST(llsdmessage "" "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llsdmessage_peer.py") +# ADD_BUILD_TEST(llareslistener llmessage) +======= +>>>>>>> other ENDIF (NOT LINUX AND VIEWER) |