diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:34:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:34:49 -0400 |
| commit | 51b75b883269a0a78a9428a690324c17abf028c1 (patch) | |
| tree | 56e131516119cf7c6fef2219ca8b8b454ceab0c0 /indra/cmake/LLKDU.cmake | |
| parent | c4ec708922ad5d4a5844b90b8042a939a34733ac (diff) | |
| parent | df329d14a9b882f1bc9c2c598043569ca2688c03 (diff) | |
merge changes for storm-1108
Diffstat (limited to 'indra/cmake/LLKDU.cmake')
| -rw-r--r-- | indra/cmake/LLKDU.cmake | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index f5cbad03a6..e478b01f84 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -1,20 +1,21 @@ # -*- 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) - set(USE_KDU ON) -endif (INSTALL_PROPRIETARY AND NOT STANDALONE) +# USE_KDU can be set when launching cmake 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) + set(USE_KDU ON CACHE BOOL "Use Kakadu library.") +endif (INSTALL_PROPRIETARY) if (USE_KDU) + include(Prebuilt) 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(KDU_INCLUDE_DIR ${AUTOBUILD_INSTALL_DIR}/include/kdu) set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu) set(LLKDU_LIBRARIES llkdu) endif (USE_KDU) |