From fc3c0f48d92bf9c3dcad622b2b8e9340edc92c7c Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 31 Dec 2024 18:13:54 +0800 Subject: Decide lib64 or x86_64-linux-gnu based on distro Some builders might just have their installation somehow customised to have both. --- indra/newview/ViewerInstall.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 17ba8ff2fc..47a0512885 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -101,10 +101,10 @@ else (${LINUX_DISTRO} MATCHES arch) endif (${LINUX_DISTRO} MATCHES arch) if (LINUX) - if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) + if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) set(_LIB lib/${ARCH}-linux-gnu) - elseif (EXISTS /lib64 AND NOT ${LINUX_DISTRO} MATCHES arch) - set(_LIB lib64) + elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed)) + set(_LIB lib${ADDRESS_SIZE}) else () set(_LIB lib) endif () -- cgit v1.2.3