From 3b6606eed8b04783f8b80df71e4fe24f7432bde5 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 19 Jan 2012 12:04:42 -0500 Subject: PATH-180 FIX? updating to latest pathing lib, and ensuring order invariance Grabbing latest packaged pathing library, and adding linker flags to deal with circular dependencies.` --- indra/cmake/LLPathingLib.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra') diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake index c108b33e8c..8e622d83db 100644 --- a/indra/cmake/LLPathingLib.cmake +++ b/indra/cmake/LLPathingLib.cmake @@ -16,3 +16,8 @@ set(LLPATHING_LIBRARIES debug ${LL_PATHING_DEBUG_LIB} optimized ${LL_PATHING_RELEASE_LIB} ) + +if (LINUX) + list(INSERT LLPATHING_LIBRARIES 0 -Wl,--start-group) + list(APPEND LLPATHING_LIBRARIES -Wl,--end-group) +endif (LINUX) -- cgit v1.2.3