diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-02 14:16:08 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-02 14:16:08 -0800 |
commit | b81feb6ae7fd9d01b63999e53c5c231551d53200 (patch) | |
tree | 527df9920d7d27000981fe726e5fbed9deccadbd /indra/cmake/LLKDU.cmake | |
parent | 3e80fa3dbc943de9b784fedc202ba38cf238f46d (diff) | |
parent | 74dda61dfbccfd9ab5ef309aeb4b2b8c86e06cd6 (diff) |
Merge of viewer-2-0 changes
Diffstat (limited to 'indra/cmake/LLKDU.cmake')
-rw-r--r-- | indra/cmake/LLKDU.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index f103dcf664..6b69388896 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -1,7 +1,7 @@ # -*- cmake -*- include(Prebuilt) -if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu) +if (INSTALL_PROPRIETARY AND NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu) use_prebuilt_binary(kdu) if (WINDOWS) set(KDU_LIBRARY debug kdu_cored optimized kdu_core) @@ -15,4 +15,4 @@ if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu) set(LLKDU_STATIC_LIBRARY llkdu_static) set(LLKDU_LIBRARIES ${LLKDU_LIBRARY}) set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY}) -endif (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu) +endif (INSTALL_PROPRIETARY AND NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu) |