From 71de5f622a7917f78823a7e7840194e1b0f8f070 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 26 Aug 2010 14:23:12 -0500 Subject: Add missing files from viewer-experimental --- indra/cmake/LLConvexDecomposition.cmake | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 indra/cmake/LLConvexDecomposition.cmake (limited to 'indra/cmake/LLConvexDecomposition.cmake') diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake new file mode 100644 index 0000000000..ae9dc3c17a --- /dev/null +++ b/indra/cmake/LLConvexDecomposition.cmake @@ -0,0 +1,16 @@ +# -*- cmake -*- +include(Prebuilt) + +set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + +if (INSTALL_PROPRIETARY AND NOT STANDALONE) + use_prebuilt_binary(llconvexdecomposition) + if (WINDOWS) + set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) + else (WINDOWS) + set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) + endif (WINDOWS) +else (INSTALL_PROPRIETARY AND NOT STANDALONE) + use_prebuilt_binary(llconvexdecompositionstub) + set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) +endif (INSTALL_PROPRIETARY AND NOT STANDALONE) -- cgit v1.2.3 From b04d761a9c64da5a9fadd6accba1d91dcdbc2dd5 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 14 Sep 2010 11:11:18 -0400 Subject: 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 --- indra/cmake/LLConvexDecomposition.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake/LLConvexDecomposition.cmake') 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) -- cgit v1.2.3 From b102719c538d74133e080fc289103aa09334a16d Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Thu, 7 Oct 2010 16:51:29 -0400 Subject: 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. --- indra/cmake/LLConvexDecomposition.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'indra/cmake/LLConvexDecomposition.cmake') 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) -- cgit v1.2.3