diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:59 -0500 |
| commit | 69b6aa5db2034e8e34bd234a4ebf04763419933a (patch) | |
| tree | 5dd27272bed719fafb4bbb67a184cf57f0106406 /indra/llimage/CMakeLists.txt | |
| parent | 1a9b0523de81c9844aeaa13a3191d9881918bfa8 (diff) | |
| parent | 12bc7eb0179d3154f929252c7ff95a4e8e244c0d (diff) | |
merge changes for storm-669
Diffstat (limited to 'indra/llimage/CMakeLists.txt')
| -rw-r--r-- | indra/llimage/CMakeLists.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt index a69621a57b..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} @@ -57,11 +58,18 @@ add_library (llimage ${llimage_SOURCE_FILES}) # Sort by high-level to low-level target_link_libraries(llimage llcommon - llimagej2coj # *HACK: In theory a noop for KDU builds? ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ) # 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) + + + |