diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-26 12:28:04 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-26 12:28:04 +0100 |
| commit | a1d010293d5a72fe31c927cd8fcc5e306cd964b0 (patch) | |
| tree | 86055fe95108185a73c42966063622c3b3a37a19 /indra/cmake | |
| parent | 1d89a80ba7293309fd4fbdd03b802c5c2998aac7 (diff) | |
| parent | 3862dcd51b97b6b5ed3ab6ec2cb8b286773edb6e (diff) | |
re-merge viewer-public. has a rough edge or two, but this is closer to the snowglobe2.1 and viewer2.2 code, and beats people re-applying their viewer-public changes piecemeal while waiting for this to land.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLKDU.cmake | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index fbe410c25f..27c8ada686 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -3,18 +3,5 @@ include(Prebuilt) if (INSTALL_PROPRIETARY AND NOT STANDALONE) use_prebuilt_binary(kdu) - if (EXISTS ${LIBS_CLOSED_DIR}/llkdu) - if (WINDOWS) - set(KDU_LIBRARY debug kdu_cored optimized kdu_core) - else (WINDOWS) - set(KDU_LIBRARY kdu) - endif (WINDOWS) - - set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) - - set(LLKDU_LIBRARY llkdu) - set(LLKDU_STATIC_LIBRARY llkdu_static) - set(LLKDU_LIBRARIES ${LLKDU_LIBRARY}) - set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY}) - endif (EXISTS ${LIBS_CLOSED_DIR}/llkdu) + set(LLKDU_LIBRARY llkdu) endif (INSTALL_PROPRIETARY AND NOT STANDALONE) |