diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-19 18:06:56 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-19 18:06:56 -0800 |
| commit | 37626b32ffd23d848ce5e41abf6052445b6633e2 (patch) | |
| tree | aa9aa6a70a4fdd5c3510a52cd64cc17182ea6448 /indra/cmake | |
| parent | 9682b9b5db695643b90720f9da2c8d03e4559dd4 (diff) | |
STORM-151 : Modify llkdu cmake to point explicitely to static libs, simplify make (in progress, don't pull yet)
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLKDU.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index 5b28f9b2e6..e80b235376 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -10,13 +10,11 @@ endif (INSTALL_PROPRIETARY AND NOT STANDALONE) if (USE_KDU) use_prebuilt_binary(kdu) if (WINDOWS) - set(KDU_LIBRARY debug kdud optimized kdu) + set(KDU_LIBRARY debug kdud.lib optimized kdu.lib) else (WINDOWS) - set(KDU_LIBRARY kdu) + set(KDU_LIBRARY libkdu.a) endif (WINDOWS) - set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/kdu) - - set(LLKDU_LIBRARY llkdu) - set(LLKDU_LIBRARIES ${LLKDU_LIBRARY}) + set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu) + set(LLKDU_LIBRARIES llkdu) endif (USE_KDU) |