diff options
author | Nyx Linden <nyx@lindenlab.com> | 2010-10-07 16:57:18 -0400 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2010-10-07 16:57:18 -0400 |
commit | 1b7b05eeb9fc085471ebb64cf237d6d49e0b13bc (patch) | |
tree | c3b08571c7a1f8aa6d75cb202dcbd451f14cc910 /indra | |
parent | b70ccfe8e31cd253069a6e0ae0ec03e301d26578 (diff) | |
parent | b102719c538d74133e080fc289103aa09334a16d (diff) |
merge
Diffstat (limited to 'indra')
-rw-r--r-- | indra/cmake/LLConvexDecomposition.cmake | 6 |
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) |