diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-08-18 17:56:58 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-08-18 17:56:58 +0100 |
| commit | 2977cbb741e2d3ae78034e73a5257cf6cf1792c6 (patch) | |
| tree | 5ae1cd1f39c2f36bde47fe14069c3d98f26a356a | |
| parent | 855192a83b908bb2812a6faeeec11da1dcb95cd7 (diff) | |
VWR-20770 (SNOW-649) FIXED Missing LL_TESTS condition around llplugin unit test
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llplugin/CMakeLists.txt | 29 |
2 files changed, 17 insertions, 13 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 612041ecc5..e124a68df4 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -616,6 +616,7 @@ Teardrops Fall VWR-5366 Techwolf Lupindo SNOW-92 + SNOW-649 VWR-12385 tenebrous pau VWR-247 diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt index 441becbae0..fdd510b389 100644 --- a/indra/llplugin/CMakeLists.txt +++ b/indra/llplugin/CMakeLists.txt @@ -57,18 +57,21 @@ add_library (llplugin ${llplugin_SOURCE_FILES}) add_subdirectory(slplugin) -# Add tests -include(LLAddBuildTest) -# UNIT TESTS -SET(llplugin_TEST_SOURCE_FILES - llplugincookiestore.cpp - ) +if (LL_TESTS) + # Add tests + include(LLAddBuildTest) -# 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}" - ) + # UNIT TESTS + SET(llplugin_TEST_SOURCE_FILES + llplugincookiestore.cpp + ) -LL_ADD_PROJECT_UNIT_TESTS(llplugin "${llplugin_TEST_SOURCE_FILES}") + # 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}" + ) + + LL_ADD_PROJECT_UNIT_TESTS(llplugin "${llplugin_TEST_SOURCE_FILES}") +endif (LL_TESTS) |