diff options
| author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-04-19 12:57:19 -0700 |
|---|---|---|
| committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-04-19 12:57:19 -0700 |
| commit | 3c4ca3985a274c519cf9ed6a7bb50ef85aaaa0ac (patch) | |
| tree | b49fc90bf1c4634557972dd48bca10e887c071a5 /indra/llplugin/CMakeLists.txt | |
| parent | 7c90da6b9ef48757636b04f6401d5ea1dedf85f0 (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/llplugin/CMakeLists.txt')
| -rw-r--r-- | indra/llplugin/CMakeLists.txt | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt index 129efeb529..5cc129a267 100644 --- a/indra/llplugin/CMakeLists.txt +++ b/indra/llplugin/CMakeLists.txt @@ -29,7 +29,6 @@ include_directories(SYSTEM set(llplugin_SOURCE_FILES llpluginclassmedia.cpp - llplugincookiestore.cpp llplugininstance.cpp llpluginmessage.cpp llpluginmessagepipe.cpp @@ -43,7 +42,6 @@ set(llplugin_HEADER_FILES llpluginclassmedia.h llpluginclassmediaowner.h - llplugincookiestore.h llplugininstance.h llpluginmessage.h llpluginmessageclasses.h @@ -70,20 +68,3 @@ add_library (llplugin ${llplugin_SOURCE_FILES}) add_subdirectory(slplugin) -# Add tests -if (LL_TESTS) - include(LLAddBuildTest) - # UNIT TESTS - SET(llplugin_TEST_SOURCE_FILES - llplugincookiestore.cpp - ) - - # llplugincookiestore has a dependency on curl, so we need to link the curl library into the test. - set_source_files_properties( - llplugincookiestore.cpp - PROPERTIES - LL_TEST_ADDITIONAL_LIBRARIES "${CURL_LIBRARIES};${NGHTTP2_LIBRARIES}" - ) - - LL_ADD_PROJECT_UNIT_TESTS(llplugin "${llplugin_TEST_SOURCE_FILES}") -endif (LL_TESTS) |