diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-08 10:47:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-08 10:47:25 -0400 |
| commit | bb74487c859acccb8f88002630606419761136e4 (patch) | |
| tree | eadeabd044a9fa06c789b957d9b2c823c47617dd /indra/viewer_components | |
| parent | 970ce1e1626c205302c4085610819571c1ce79f4 (diff) | |
| parent | d25a30e55b7e6a20173c3a53891489adc5610d72 (diff) | |
Merge fixes for VWR-23047, VWR-20911, and SNOW-748
Diffstat (limited to 'indra/viewer_components')
| -rw-r--r-- | indra/viewer_components/login/CMakeLists.txt | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt index fb65779eb7..fe64926da6 100644 --- a/indra/viewer_components/login/CMakeLists.txt +++ b/indra/viewer_components/login/CMakeLists.txt @@ -3,7 +3,9 @@ project(login) include(00-Common) -include(LLAddBuildTest) +if(LL_TESTS) + include(LLAddBuildTest) +endif(LL_TESTS) include(LLCommon) include(LLMath) include(LLXML) @@ -43,14 +45,16 @@ target_link_libraries(lllogin ${PTH_LIBRARIES} ) -SET(lllogin_TEST_SOURCE_FILES +if(LL_TESTS) + SET(lllogin_TEST_SOURCE_FILES + lllogin.cpp + ) + + set_source_files_properties( lllogin.cpp + PROPERTIES + LL_TEST_ADDITIONAL_LIBRARIES "${PTH_LIBRARIES}" ) -set_source_files_properties( - lllogin.cpp - PROPERTIES - LL_TEST_ADDITIONAL_LIBRARIES "${PTH_LIBRARIES}" - ) - -LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}") + LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}") +endif(LL_TESTS) |