diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-08-13 18:34:35 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-08-13 18:34:35 +0100 |
| commit | 73ca4eac149f24db26e5f412aca30a8d8ffe7fa6 (patch) | |
| tree | c6980a115acff996507e586aa4126b40c9edac19 | |
| parent | c4e5de1b276f60968ed23f3b43015231fbf091b7 (diff) | |
Reintroduce check for LLKDU source after downloading the prebuilt lib, to avoid adding a build dependency on it.
| -rw-r--r-- | indra/cmake/LLKDU.cmake | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index b6943e7007..fbe410c25f 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -3,16 +3,18 @@ include(Prebuilt) if (INSTALL_PROPRIETARY AND NOT STANDALONE) use_prebuilt_binary(kdu) - if (WINDOWS) - set(KDU_LIBRARY debug kdu_cored optimized kdu_core) - else (WINDOWS) - set(KDU_LIBRARY kdu) - endif (WINDOWS) + 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(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}) + 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) endif (INSTALL_PROPRIETARY AND NOT STANDALONE) |