From b04d761a9c64da5a9fadd6accba1d91dcdbc2dd5 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Tue, 14 Sep 2010 11:11:18 -0400
Subject: [PATCH] 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(-)
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)
--
GitLab