From 221885fc73c29cfc8600c9f892d19ca068e886b0 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 17 Feb 2010 14:29:56 +0000
Subject: [PATCH] Hack librt inclusion into llcommon for all Linux builds. The
dep is needed for llcommon, but it was being satisfied elsewhere for viewer
builds and got to dodge the problem. This should quieten the server builds
somewhat.
---
indra/cmake/APR.cmake | 9 ++++++---
indra/cmake/GStreamer010Plugin.cmake | 1 -
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index f4706dd4f27..9d1269b33d1 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -54,7 +54,10 @@ else (STANDALONE)
endif (WINDOWS)
set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
- if (LINUX AND VIEWER)
- list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid)
- endif (LINUX AND VIEWER)
+ if (LINUX)
+ if (VIEWER)
+ list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid rt)
+ endif (VIEWER)
+ list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt)
+ endif (LINUX)
endif (STANDALONE)
diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake
index 0d334837d4e..0ca432da184 100644
--- a/indra/cmake/GStreamer010Plugin.cmake
+++ b/indra/cmake/GStreamer010Plugin.cmake
@@ -24,7 +24,6 @@ elseif (LINUX)
gmodule-2.0
dl
gthread-2.0
- rt
glib-2.0
)
endif (STANDALONE)
--
GitLab