diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:24:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:24:05 -0400 |
| commit | 5e617d77f34f17f7a8f3677270f2738f857a60b8 (patch) | |
| tree | 921afb347a56f21c0ae7d5c34aae73d9ec96b1bb /indra/llkdu | |
| parent | e0ca936fbf7411bcc1cdd935a50c5913db6a1cb9 (diff) | |
| parent | 8bc829220f8fc99180a1b1917220576a59de7339 (diff) | |
merge changes for storm-1072
Diffstat (limited to 'indra/llkdu')
| -rw-r--r-- | indra/llkdu/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | indra/llkdu/tests/llimagej2ckdu_test.cpp | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt index 7ed1c6c694..046629b514 100644 --- a/indra/llkdu/CMakeLists.txt +++ b/indra/llkdu/CMakeLists.txt @@ -19,6 +19,7 @@ include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLIMAGE_INCLUDE_DIRS} ${KDU_INCLUDE_DIR} + ${LLKDU_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ) @@ -49,6 +50,15 @@ if (USE_KDU) SET(llkdu_TEST_SOURCE_FILES llimagej2ckdu.cpp ) + SET(llkdu_test_additional_HEADER_FILES + llimagej2ckdu.h + llkdumem.h + lltut.h + ) + SET(llkdu_test_additional_INCLUDE_DIRS + ${KDU_INCLUDE_DIR} + ${LLKDU_INCLUDE_DIRS} + ) LL_ADD_PROJECT_UNIT_TESTS(llkdu "${llkdu_TEST_SOURCE_FILES}") endif (LL_TESTS) diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 1ccee4bb64..7ac24a969a 100644 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -27,10 +27,10 @@ #include "linden_common.h" // Class to test -#include "../llimagej2ckdu.h" -#include "../llkdumem.h" +#include "llimagej2ckdu.h" +#include "llkdumem.h" // Tut header -#include "../test/lltut.h" +#include "lltut.h" // ------------------------------------------------------------------------------------------- // Stubbing: Declarations required to link and run the class being tested |