From 94408352d5105e14bfa56a946b36e3b7d1b01637 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 28 Aug 2024 08:44:58 +0800 Subject: Fix order of checking lib64 & lib/x86_64-linux-gnu Ubuntu, unlike Debian, has /lib64 and /usr/lib64 in their system, so it misled CMake. This is a quick fix, ideally it's the distro name that is checked. --- indra/cmake/UnixInstall.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake index 021700b374..7aa05ff5a6 100644 --- a/indra/cmake/UnixInstall.cmake +++ b/indra/cmake/UnixInstall.cmake @@ -14,13 +14,13 @@ if (INSTALL) "Top-level installation directory.") endif (CMAKE_SYSTEM_NAME MATCHES FreeBSD) - if (EXISTS /lib64) - set(_LIB lib64) - elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) + if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) set(_LIB lib/${ARCH}-linux-gnu) - else (EXISTS /lib64) + elseif (EXISTS /lib64) + set(_LIB lib64) + else (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) set(_LIB lib) - endif (EXISTS /lib64) + endif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/${_LIB} CACHE PATH "Installation directory for read-only shared files.") -- cgit v1.2.3