summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2010-10-07 16:51:29 -0400
committerNyx Linden <nyx@lindenlab.com>2010-10-07 16:51:29 -0400
commitb102719c538d74133e080fc289103aa09334a16d (patch)
tree42b35a2559793c93ffbae9c2fd9fade1820b0d0d /indra/cmake
parent99f3db16e93add8025c0b7c60641f2b950b40d01 (diff)
SH-65 WIP update convex decomp on mac
Pushing in the cmake change that will make the mac build use the non-stub version of the convex decomp lib.
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/LLConvexDecomposition.cmake6
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake
index f310a493fd..8e44504782 100644
--- a/indra/cmake/LLConvexDecomposition.cmake
+++ b/indra/cmake/LLConvexDecomposition.cmake
@@ -5,11 +5,7 @@ set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
if (INSTALL_PROPRIETARY AND NOT STANDALONE)
use_prebuilt_binary(llconvexdecomposition)
- if (WINDOWS OR LINUX)
- set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition)
- else (WINDOWS OR LINUX)
- set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub)
- endif (WINDOWS OR LINUX)
+ set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition)
else (INSTALL_PROPRIETARY AND NOT STANDALONE)
use_prebuilt_binary(llconvexdecompositionstub)
set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub)