diff options
| author | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-03-26 09:17:18 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-03-26 09:17:18 -0700 |
| commit | 6503d6d8436c40096a3ee853f3aee688e6d6b9f0 (patch) | |
| tree | b3edfbd87c6042d47f9e7badfaf8be3578999553 /indra/newview | |
| parent | 0560a8c4576972ae3a51dc4a1e5fdd77e2167d73 (diff) | |
| parent | 4da34679618f981ff49669158ccfbeaad6712279 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a405baf50d..bc2ef4f2c5 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2082,32 +2082,11 @@ if (LL_TESTS) LL_TEST_ADDITIONAL_LIBRARIES "${JSONCPP_LIBRARIES}" ) - set_source_files_properties( - lllogininstance.cpp - PROPERTIES - LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}" - ) - - ################################################## - # DISABLING PRECOMPILED HEADERS USAGE FOR TESTS - ################################################## - # if(USE_PRECOMPILED_HEADERS) - # set_source_files_properties( - # ${viewer_TEST_SOURCE_FILES} - # PROPERTIES - # LL_TEST_ADDITIONAL_SOURCE_FILES llviewerprecompiledheaders.cpp - # ) - # endif(USE_PRECOMPILED_HEADERS) LL_ADD_PROJECT_UNIT_TESTS(${VIEWER_BINARY_NAME} "${viewer_TEST_SOURCE_FILES}") #set(TEST_DEBUG on) set(test_sources llcapabilitylistener.cpp) - ################################################## - # DISABLING PRECOMPILED HEADERS USAGE FOR TESTS - ################################################## - # if(USE_PRECOMPILED_HEADERS) - # set(test_sources "${test_sources}" llviewerprecompiledheaders.cpp) - # endif(USE_PRECOMPILED_HEADERS) + set(test_libs ${LLMESSAGE_LIBRARIES} ${WINDOWS_LIBRARIES} |