From 1c14b084569d6482d25d6ea2c29dae716cd1d7f7 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 26 Jan 2012 14:06:57 -0800
Subject: [PATCH] PATH-181 and PATH-194: Starting to put back the ability to
build the viewer using the stub libraries.
---
indra/cmake/LLPhysicsExtensions.cmake | 38 +++++++++++----------------
1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake
index 598ac728495..81493dfdff3 100644
--- a/indra/cmake/LLPhysicsExtensions.cmake
+++ b/indra/cmake/LLPhysicsExtensions.cmake
@@ -1,31 +1,25 @@
# -*- cmake -*-
include(Prebuilt)
-use_prebuilt_binary(llphysicsextensions)
set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include)
-set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug)
-set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release)
+if (INSTALL_PROPRIETARY AND NOT STANDALONE)
+ use_prebuilt_binary(llphysicsextensions)
-find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
-find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
+ set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug)
+ set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release)
-set(LLPHYSICS_LIBRARIES
+ find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
+ find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
- debug ${LL_PHYSICS_DEBUG_LIB}
- optimized ${LL_PHYSICS_RELEASE_LIB}
-)
-
-if (LINUX)
- list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group)
- list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group)
-endif (LINUX)
-
-# if (INSTALL_PROPRIETARY AND NOT STANDALONE)
-# use_prebuilt_binary(llconvexdecomposition)
-# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition)
-# else (INSTALL_PROPRIETARY AND NOT STANDALONE)
-# use_prebuilt_binary(llconvexdecompositionstub)
-# set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub)
-# endif (INSTALL_PROPRIETARY AND NOT STANDALONE)
+ set(LLPHYSICS_LIBRARIES
+ debug ${LL_PHYSICS_DEBUG_LIB}
+ optimized ${LL_PHYSICS_RELEASE_LIB}
+ )
+ if (LINUX)
+ list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group)
+ list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group)
+ endif (LINUX)
+else (INSTALL_PROPRIETARY AND NOT STANDALONE)
+endif (INSTALL_PROPRIETARY AND NOT STANDALONE)
--
GitLab