diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-10-26 13:05:54 -0700 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-26 13:05:54 -0700 |
commit | 1d67a9084199910d35a44ac427a07fc1d9d6a4fd (patch) | |
tree | 4d942a13d1fd358a8a10a67554ea9a85b7f04c6f /indra/cmake | |
parent | 19fc3fb32c3cd95fcfb5708b59b5620e506c5179 (diff) | |
parent | e84ff39e4c7c5b028a6b8b4f6dc5d37c525eb1c4 (diff) |
merge with remote repo
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) |