diff options
author | Dave Parks <davep@lindenlab.com> | 2011-05-02 14:52:12 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-05-02 14:52:12 -0500 |
commit | a25f8987032afede673b818fe7544975eba036b5 (patch) | |
tree | cfa15a82661d407fd9f2031e7dfd6f7e0be48bb2 /indra/llplugin/CMakeLists.txt | |
parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
parent | 43083743747bece13301e2789ab36ed7e4886aba (diff) |
merge
Diffstat (limited to 'indra/llplugin/CMakeLists.txt')
-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) |