From 221885fc73c29cfc8600c9f892d19ca068e886b0 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 17 Feb 2010 14:29:56 +0000 Subject: 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 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'indra/cmake/APR.cmake') diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index f4706dd4f2..9d1269b33d 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) -- cgit v1.2.3 From 33a3a0d156c3664dc9a61353c7b63f9343b0d1f5 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 17 Feb 2010 14:31:02 +0000 Subject: follow-up to previous fix - don't link to librt twice. --- indra/cmake/APR.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake/APR.cmake') diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 9d1269b33d..180504d286 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -56,7 +56,7 @@ else (STANDALONE) if (LINUX) if (VIEWER) - list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid rt) + list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid) endif (VIEWER) list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt) endif (LINUX) -- cgit v1.2.3