From 0d8f31c6b02faeb6cecf53ece07e416be732b368 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 3 Jul 2012 16:07:49 -0700
Subject: [PATCH] Adding an import for the new RelWithDebInfo build of the
physics extensions library.
---
autobuild.xml | 12 ++++++------
indra/cmake/LLPhysicsExtensions.cmake | 2 ++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 275c55e9888..9de6d091411 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1110,9 +1110,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>e51ef18547bb9d95b1e151fc63dfcc32</string>
+ <string>034bfd5189e98e9a011e834c66c88378</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/261086/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120702.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/261164/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120703.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1122,9 +1122,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>e6883ee8a86c2b414be82ac522dd675a</string>
+ <string>b28e203312bb2a51890c210fc9a839ba</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/261086/arch/Linux/installer/llphysicsextensions-0.1-linux-20120703.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/261164/arch/Linux/installer/llphysicsextensions-0.1-linux-20120703.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -1134,9 +1134,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3338bd0b4a11e993b6303e8c45a5197d</string>
+ <string>d1c6d4a8c235b93be93671f787c506f1</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/261086/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120702.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/261164/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120703.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake
index 73d5dd59cf5..2d26360d79e 100644
--- a/indra/cmake/LLPhysicsExtensions.cmake
+++ b/indra/cmake/LLPhysicsExtensions.cmake
@@ -13,9 +13,11 @@ 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)
+set(LLPHYSICS_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/relwithdebinfo)
find_library(LL_PHYSICS_DEBUG_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
find_library(LL_PHYSICS_RELEASE_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
+find_library(LL_PHYSICS_RELWITHDEBINFO_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_RELWITHDEBINFO_LIBRARY_PATH})
set(LLPHYSICS_LIBRARIES
--
GitLab