diff options
author | Dave Parks <davep@lindenlab.com> | 2011-05-16 16:11:56 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-05-16 16:11:56 -0500 |
commit | 26f321bf6530734173792f92316b32c470cc1b20 (patch) | |
tree | b6c913bc714ce29ee559a0da49c6318051637789 /indra/llplugin | |
parent | 113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff) | |
parent | 8ae550996c70df16b707f6773666b93409123689 (diff) |
merge
Diffstat (limited to 'indra/llplugin')
-rw-r--r-- | indra/llplugin/CMakeLists.txt | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt index 1dc05e0b20..2f28673c07 100644 --- a/indra/llplugin/CMakeLists.txt +++ b/indra/llplugin/CMakeLists.txt @@ -66,21 +66,20 @@ add_library (llplugin ${llplugin_SOURCE_FILES}) add_subdirectory(slplugin) +# Add tests if (LL_TESTS) - # Add tests - include(LLAddBuildTest) + include(LLAddBuildTest) + # UNIT TESTS + SET(llplugin_TEST_SOURCE_FILES + llplugincookiestore.cpp + ) - # 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}" + ) - # 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}") + LL_ADD_PROJECT_UNIT_TESTS(llplugin "${llplugin_TEST_SOURCE_FILES}") endif (LL_TESTS) |