From 1d522aca8a5d5205f6d6150699ce5b9b8425c007 Mon Sep 17 00:00:00 2001
From: "Graham Linden graham@lindenlab.com"
<Graham Linden graham@lindenlab.com>
Date: Tue, 6 Mar 2018 19:20:52 +0000
Subject: [PATCH] Reference updated libatmosphere package.
---
autobuild.xml | 16 ++++++++--------
indra/cmake/Atmosphere.cmake | 2 +-
indra/llrender/CMakeLists.txt | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 6a463b76547..207c6d7e1a2 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -64,9 +64,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3950f04d10efd9596093e45f2a265ce1</string>
+ <string>053b2324eed0a023f7fdb6b206b62795</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14058/88070/libatmosphere-1.0.0.100-darwin-512856.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14502/92362/libatmosphere-1.0.0.100-darwin-513070.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -76,9 +76,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>c679a42268c3b22bb94366a7dff2e885</string>
+ <string>729cb87547380bdf6860222b46298ff6</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14482/92320/libatmosphere-1.0.0.100-darwin64-513060.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14501/92356/libatmosphere-1.0.0.100-darwin64-513070.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -88,9 +88,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>724fcf872b40b2fcf717e4569517725a</string>
+ <string>d79c2b71cd3609274aa9f73a80de3472</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14481/92314/libatmosphere-1.0.0.100-windows-513059.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14507/92471/libatmosphere-1.0.0.100-windows-513070.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -100,9 +100,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3edae1ac94886c4611489202d1a8eaa1</string>
+ <string>bbf84ebf5c8f34c6c08a43daeb22b580</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14480/92308/libatmosphere-1.0.0.100-windows64-513059.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14506/92465/libatmosphere-1.0.0.100-windows64-513070.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
diff --git a/indra/cmake/Atmosphere.cmake b/indra/cmake/Atmosphere.cmake
index 0975e3df02e..9c14df2a11c 100644
--- a/indra/cmake/Atmosphere.cmake
+++ b/indra/cmake/Atmosphere.cmake
@@ -1,5 +1,5 @@
# -*- cmake -*-
include(Prebuilt)
use_prebuilt_binary(libatmosphere)
-set(LIBATMOSPHERE_LIBRARIES libatmosphere)
+set(LIBATMOSPHERE_LIBRARIES atmosphere)
set(LIBATMOSPHERE_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/atmosphere)
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index dcfbd71dec9..26aaf10d075 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -132,7 +132,7 @@ target_link_libraries(llrender
${LLVFS_LIBRARIES}
${LLWINDOW_LIBRARIES}
${FREETYPE_LIBRARIES}
- ${LIBATMOSPHERE_LIBRARIES}
+ ${LIBATMOSPHERE_LIBRARIES}
${OPENGL_LIBRARIES}
)
--
GitLab