diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
| commit | bad06f68fc3122b5b83f21f1fa8bc7e7ec53bfc8 (patch) | |
| tree | cdf1bdc9f6c665eba22645ce4a1fdf7c34d55321 /indra/llkdu | |
| parent | 211d1dfb770aa029d77cd231815a5848640b54a6 (diff) | |
| parent | af8c2bc94868e056908b4ae2fc285925cd68b56b (diff) | |
Merge. Refresh from viewer-release merged with in-progress work.
Diffstat (limited to 'indra/llkdu')
| -rwxr-xr-x[-rw-r--r--] | indra/llkdu/CMakeLists.txt | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llkdu/llimagej2ckdu.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llkdu/llimagej2ckdu.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llkdu/llkdumem.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llkdu/llkdumem.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llkdu/tests/llimagej2ckdu_test.cpp | 0 |
6 files changed, 4 insertions, 1 deletions
diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt index bdac2eded7..b8f8b420c3 100644..100755 --- a/indra/llkdu/CMakeLists.txt +++ b/indra/llkdu/CMakeLists.txt @@ -41,7 +41,10 @@ set_source_files_properties(${llkdu_HEADER_FILES} list(APPEND llkdu_SOURCE_FILES ${llkdu_HEADER_FILES}) if (USE_KDU) - add_library (${LLKDU_LIBRARIES} ${llkdu_SOURCE_FILES}) + add_library (llkdu ${llkdu_SOURCE_FILES}) + + target_link_libraries(llkdu + ${KDU_LIBRARY}) # Add tests if (LL_TESTS) diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp index 0c0a844b73..0c0a844b73 100644..100755 --- a/indra/llkdu/llimagej2ckdu.cpp +++ b/indra/llkdu/llimagej2ckdu.cpp diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index fb1f6535ba..fb1f6535ba 100644..100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h diff --git a/indra/llkdu/llkdumem.cpp b/indra/llkdu/llkdumem.cpp index 0347475559..0347475559 100644..100755 --- a/indra/llkdu/llkdumem.cpp +++ b/indra/llkdu/llkdumem.cpp diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index dbdf88b2d9..dbdf88b2d9 100644..100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 62c245f125..62c245f125 100644..100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp |