diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-14 11:11:18 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-14 11:11:18 -0400 |
| commit | b04d761a9c64da5a9fadd6accba1d91dcdbc2dd5 (patch) | |
| tree | 4e9f4688cc210daf53ce69ab17091e8bb32f034a /indra | |
| parent | fd98ea14d2b675f7a740b25273d05b709b366e80 (diff) | |
CTS-231 WIP update mac and linux autobuild libraries for glod and convex decomp
Updating cmake to ensure that linux uses the non-stub version of convex decomp.
Code reviewed by Falcon
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/LLConvexDecomposition.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake index ae9dc3c17a..f310a493fd 100644 --- a/indra/cmake/LLConvexDecomposition.cmake +++ b/indra/cmake/LLConvexDecomposition.cmake @@ -5,11 +5,11 @@ set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (INSTALL_PROPRIETARY AND NOT STANDALONE) use_prebuilt_binary(llconvexdecomposition) - if (WINDOWS) + if (WINDOWS OR LINUX) set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) - else (WINDOWS) + else (WINDOWS OR LINUX) set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) - endif (WINDOWS) + endif (WINDOWS OR LINUX) else (INSTALL_PROPRIETARY AND NOT STANDALONE) use_prebuilt_binary(llconvexdecompositionstub) set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) |