diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
commit | 1034db639462d95e54e9bf9e4d63500b745bb0a2 (patch) | |
tree | 68b010fb3f9f2c4b67e59187d125090b1c69d72f /indra/llimage/CMakeLists.txt | |
parent | 0eb491417e8479516b07cc9237242b60d36d10f5 (diff) | |
parent | eb0b8ab3ea19617a52881191bab21bfedcc5696d (diff) |
merge changes for storm-806
Diffstat (limited to 'indra/llimage/CMakeLists.txt')
-rw-r--r-- | indra/llimage/CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt index 6834267d4b..ea8c1a1107 100644 --- a/indra/llimage/CMakeLists.txt +++ b/indra/llimage/CMakeLists.txt @@ -3,12 +3,13 @@ project(llimage) include(00-Common) -include(LLAddBuildTest) include(LLCommon) include(LLImage) include(LLMath) include(LLVFS) include(ZLIB) +include(LLAddBuildTest) +include(Tut) include_directories( ${LLCOMMON_INCLUDE_DIRS} @@ -63,4 +64,12 @@ target_link_libraries(llimage ) # Add tests -#ADD_BUILD_TEST(llimageworker llimage) +if (LL_TESTS) + SET(llimage_TEST_SOURCE_FILES + llimageworker.cpp + ) + LL_ADD_PROJECT_UNIT_TESTS(llimage "${llimage_TEST_SOURCE_FILES}") +endif (LL_TESTS) + + + |