From fc3c0f48d92bf9c3dcad622b2b8e9340edc92c7c Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
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/cmake/LibraryInstall.cmake | 18 +++++++++---------
indra/cmake/UnixInstall.cmake | 10 +++++-----
indra/llwebrtc/CMakeLists.txt | 6 +++---
indra/media_plugins/cef/CMakeLists.txt | 10 +++++-----
indra/media_plugins/libvlc/CMakeLists.txt | 6 +++---
indra/newview/ViewerInstall.cmake | 6 +++---
6 files changed, 28 insertions(+), 28 deletions(-)
(limited to 'indra')
diff --git a/indra/cmake/LibraryInstall.cmake b/indra/cmake/LibraryInstall.cmake
index e98d71f044..daed766a59 100644
--- a/indra/cmake/LibraryInstall.cmake
+++ b/indra/cmake/LibraryInstall.cmake
@@ -1,13 +1,13 @@
list(REMOVE_ITEM ${PROJECT_NAME}_HEADER_FILES CMakeLists.txt)
#install(FILES ${${PROJECT_NAME}_HEADER_FILES}
-# DESTINATION include/${PROJECT_NAME})
+# DESTINATION include/${PROJECT_NAME})
if (BUILD_SHARED_LIBS)
- if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
- set(_LIB lib/${ARCH}-linux-gnu)
- elseif (EXISTS /lib64 AND NOT ${LINUX_DISTRO} MATCHES arch)
- set(_LIB lib64)
- else ()
- set(_LIB lib)
- endif ()
- install(TARGETS ${PROJECT_NAME} DESTINATION ${_LIB})
+ if (${LINUX_DISTRO} MATCHES debian OR ${LINUX_DISTRO} MATCHES ubuntu)
+ set(_LIB lib/${ARCH}-linux-gnu)
+ elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+ set(_LIB lib${ADDRESS_SIZE})
+ else ()
+ set(_LIB lib)
+ endif ()
+ install(TARGETS ${PROJECT_NAME} DESTINATION ${_LIB})
endif ()
diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake
index c925376e63..48d84dc062 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 ${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)
- else (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+ elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+ set(_LIB lib${ADDRESS_SIZE})
+ else ()
set(_LIB lib)
- endif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+ endif ()
set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/${_LIB} CACHE PATH
"Installation directory for read-only shared files.")
diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt
index 7700eeb7c6..1e9898e5cc 100644
--- a/indra/llwebrtc/CMakeLists.txt
+++ b/indra/llwebrtc/CMakeLists.txt
@@ -80,10 +80,10 @@ endif (LL_TESTS)
if (INSTALL)
if (DARWIN)
set(_LIB ../Frameworks)
- elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+ elseif (${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 (DARWIN)
set(_LIB lib)
endif (DARWIN)
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 3799fa41ac..007b74eda7 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -143,13 +143,13 @@ if (INSTALL)
DESTINATION SLPlugin.app/Contents/Frameworks
)
elseif (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)
- else (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+ elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+ set(_LIB lib${ADDRESS_SIZE})
+ else ()
set(_LIB lib)
- endif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+ endif ()
if (${LINUX_DISTRO} MATCHES arch)
install(
PROGRAMS
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index 6d005bb6d2..84e0d1da59 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -90,10 +90,10 @@ if (INSTALL)
/Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.dylib
DESTINATION ${_LIB}/plugins
)
- elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+ elseif (${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 (DARWIN)
set(_LIB lib)
endif (DARWIN)
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