diff options
| author | James Cook <james@lindenlab.com> | 2009-10-22 17:36:00 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-22 17:36:00 -0700 |
| commit | 07ffe9c149f3147837028612c93df3f0a4a890d0 (patch) | |
| tree | eb434e37859cc2e34226a71201f5cc9b459bbd96 /indra/cmake | |
| parent | 350138e2bb086314bcdf74052d2b14c2f9f84c83 (diff) | |
| parent | b88fc256a3a7fc5560f2e4d0ac89a0aa4d42360e (diff) | |
merge from pull
Diffstat (limited to 'indra/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) |