aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake
diff options
context:
space:
mode:
authorAleric Inglewood2010-10-08 22:43:56 +0200
committerJacek Antonelli2011-01-17 00:21:35 -0600
commit4f81ce3e43058ba71ff48e5f692cf0e48587b273 (patch)
tree867bcf685f1c17046f2dfe081618524eb459d45c /linden/indra/cmake
parentBetter format for channel/version string. (diff)
downloadmeta-impy-4f81ce3e43058ba71ff48e5f692cf0e48587b273.zip
meta-impy-4f81ce3e43058ba71ff48e5f692cf0e48587b273.tar.gz
meta-impy-4f81ce3e43058ba71ff48e5f692cf0e48587b273.tar.bz2
meta-impy-4f81ce3e43058ba71ff48e5f692cf0e48587b273.tar.xz
IMP-429: Link against prebuilt libraries / always use gtk-related system libs (linux)
(cherry picked from commit a3cffd06a0e7aa92e1b6c28e7bad655b7085296c)
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r--linden/indra/cmake/GStreamer.cmake2
-rw-r--r--linden/indra/cmake/UI.cmake2
2 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index f5f9c03..19349ca 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -80,6 +80,7 @@ else (WINDOWS)
80 gmodule-2.0 80 gmodule-2.0
81 gthread-2.0 81 gthread-2.0
82 glib-2.0 82 glib-2.0
83 gio-2.0
83 xml2.2 84 xml2.2
84 ) 85 )
85 86
@@ -99,6 +100,7 @@ else (WINDOWS)
99 gthread-2.0 100 gthread-2.0
100 rt 101 rt
101 glib-2.0 102 glib-2.0
103 gio-2.0
102 ) 104 )
103 105
104 endif (DARWIN) 106 endif (DARWIN)
diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake
index b70a531..9d068c4 100644
--- a/linden/indra/cmake/UI.cmake
+++ b/linden/indra/cmake/UI.cmake
@@ -39,6 +39,7 @@ else (STANDALONE)
39 gdk-x11-2.0 39 gdk-x11-2.0
40 gdk_pixbuf-2.0 40 gdk_pixbuf-2.0
41 glib-2.0 41 glib-2.0
42 gio-2.0
42 gmodule-2.0 43 gmodule-2.0
43 gobject-2.0 44 gobject-2.0
44 gthread-2.0 45 gthread-2.0
@@ -48,6 +49,7 @@ else (STANDALONE)
48 pangox-1.0 49 pangox-1.0
49 pangoxft-1.0 50 pangoxft-1.0
50 pixman-1 51 pixman-1
52 pangocairo-1.0
51 ) 53 )
52 endif (LINUX) 54 endif (LINUX)
53 55