From 21ee5f8d415920827a477ae236f30e7d09dc8e9f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 5 Jul 2012 09:39:21 -0400
Subject: [PATCH] successful build with llphysicsextensions stub
---
autobuild.xml | 8 ++++----
indra/cmake/LLPhysicsExtensions.cmake | 2 ++
indra/newview/CMakeLists.txt | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index fe8700e64b5..60c7b4c118c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1158,11 +1158,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ea98ebb0babcf7018bf5c10996be178a</string>
+ <string>75b3266c3d51b6ae767158969a20a324</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120704.tar.bz2</string>
+ <string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1186,11 +1186,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>eb016d162ac4714ebdfc3331ce080827</string>
+ <string>5e6db8ede04aeda9f508fe31df6500c9</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120704.tar.bz2</string>
+ <string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake
index c9812d06d6d..224d7f9b451 100644
--- a/indra/cmake/LLPhysicsExtensions.cmake
+++ b/indra/cmake/LLPhysicsExtensions.cmake
@@ -15,10 +15,12 @@ if (HAVOK)
include(Havok)
use_prebuilt_binary(llphysicsextensions_source)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src)
+ set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensions)
else (HAVOK)
use_prebuilt_binary(llphysicsextensions_stub)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
+ set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensionsstub)
endif (HAVOK)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f0045692c43..590973c890b 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1820,6 +1820,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${CRYPTO_LIBRARIES}
${LLLOGIN_LIBRARIES}
${LLPHYSICS_LIBRARIES}
+ ${LLPHYSICSEXTENSIONS_LIBRARIES}
${TCMALLOC_LIBRARIES}
)
--
GitLab