diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-12-31 18:13:54 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-12-31 18:18:17 +0800 |
| commit | fc3c0f48d92bf9c3dcad622b2b8e9340edc92c7c (patch) | |
| tree | d913bcdc43062763f34160816ab8c5457caac3d2 /indra/cmake | |
| parent | 26974d238ce5ba5a3c22b8788b6754d5911c06c2 (diff) | |
Decide lib64 or x86_64-linux-gnu based on distro
Some builders might just have their installation somehow customised to
have both.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LibraryInstall.cmake | 18 | ||||
| -rw-r--r-- | indra/cmake/UnixInstall.cmake | 10 |
2 files changed, 14 insertions, 14 deletions
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.") |