diff options
author | Nyx Linden <nyx@lindenlab.com> | 2010-10-07 18:50:20 -0400 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2010-10-07 18:50:20 -0400 |
commit | fbef8b93871df187c9029b3a8ff716fcacb830b0 (patch) | |
tree | e6ff62b5ac68f50877ae70e9cff3ab6cefb42fdb /indra/cmake | |
parent | 578389ce23960180610fce932eac1b7816ed8f68 (diff) | |
parent | aa401a3056ab65c5c206b9ba2eefcf2ef83a6d83 (diff) |
Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/
Diffstat (limited to 'indra/cmake')
-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) |