diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-06-23 18:24:41 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-06-23 18:24:41 -0400 |
| commit | 85e326e7c74268fec4902b9b8b33a310f8c49a42 (patch) | |
| tree | b16ea8b2c24781629a000f82e28149337eece174 /indra/llmessage | |
| parent | 07a05e2c0a14bb54ace65d63b55ebc8bb2a4efee (diff) | |
| parent | fae273975bc811d9c8c7b67df44653f483fe22f6 (diff) | |
Resolve merge
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 35e6f9d640..3fa6454255 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -223,11 +223,18 @@ IF (NOT LINUX AND VIEWER) # llhttpclientadapter.cpp lltrustedmessageservice.cpp lltemplatemessagedispatcher.cpp + # 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") + # llareslistener.cpp ) 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) |