diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-19 14:55:11 -0500 | 
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-19 14:55:11 -0500 | 
| commit | 3b5d6eed12d928e5a7a0bc3a8d827f676b25d060 (patch) | |
| tree | 8cf08a165c11acf92742eacc64248c1e50b2420b /indra/llplugin | |
| parent | b8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff) | |
| parent | 12b0b52b99e6f6a6538feba8589566d2f73f82c6 (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) | 
