summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md1
-rw-r--r--indra/cmake/CEFPlugin.cmake11
2 files changed, 10 insertions, 2 deletions
diff --git a/README.md b/README.md
index 9ae3e6d52e..f3031ff7bd 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,6 @@ $ megapahit
```
$ sudo dnf install gcc-c++ patchelf apr-util-devel boost-devel collada-dom-devel expat-devel fltk-devel mesa-libGLU-devel hunspell-devel jsoncpp-devel libnghttp2-devel nanosvg-devel pipewire-devel pulseaudio-libs-devel SDL2-devel uriparser-devel vlc-devel libvorbis-devel xmlrpc-epi-devel xxhash-devel
-$ patchelf --remove-rpath packages/bin/release/dullahan_host
$ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -DADDRESS_SIZE:INTERNAL=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=OFF -DUSE_FMODSTUDIO:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=ON -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=ON ../../indra
$ make -j`nproc`
$ cpack -G RPM
diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 6c52963a51..655d924160 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -19,8 +19,17 @@ if (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
RESULT_VARIABLE dullahan_installed
)
endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/dullahan_installed OR NOT ${dullahan_installed} EQUAL 0)
-else ()
+else (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
use_prebuilt_binary(dullahan)
+ if (LINUX)
+ cmake_host_system_information(RESULT LINUX_DISTRO QUERY DISTRIB_ID)
+ if (${LINUX_DISTRO} MATCHES fedora)
+ execute_process(
+ COMMAND patchelf --remove-rpath bin/release/dullahan_host
+ WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
+ )
+ endif (${LINUX_DISTRO} MATCHES fedora)
+ endif (LINUX)
endif (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
target_include_directories( ll::cef SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/cef)