diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:08:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:08:20 -0500 |
| commit | a9caa3151cea77b992c06c5a774d333ffd3016e1 (patch) | |
| tree | 330cee487295788c500bcd7096a125120a10ae75 /indra/cmake/LLKDU.cmake | |
| parent | bdd07a7a648dc7e2c290d5aa837c22c20c4af31c (diff) | |
| parent | ef1c3aac889d118530994e878d83426d4fc2ca7c (diff) | |
merge fix for storm-411
Diffstat (limited to 'indra/cmake/LLKDU.cmake')
| -rw-r--r-- | indra/cmake/LLKDU.cmake | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index 27c8ada686..f5cbad03a6 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -1,7 +1,20 @@ # -*- cmake -*- include(Prebuilt) +# USE_KDU can be set when launching cmake or develop.py as an option using the argument -DUSE_KDU:BOOL=ON +# When building using proprietary binaries though (i.e. having access to LL private servers), we always build with KDU if (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(kdu) - set(LLKDU_LIBRARY llkdu) + set(USE_KDU ON) endif (INSTALL_PROPRIETARY AND NOT STANDALONE) + +if (USE_KDU) + use_prebuilt_binary(kdu) + if (WINDOWS) + set(KDU_LIBRARY kdu.lib) + else (WINDOWS) + set(KDU_LIBRARY libkdu.a) + endif (WINDOWS) + set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/kdu) + set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu) + set(LLKDU_LIBRARIES llkdu) +endif (USE_KDU) |