Moved distributed shared objects into bin

2022-04-02 17:10:58 +01:00
parent 8a57e46189
commit f0adcc3fca
47 changed files with 3 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ find_package(Qt6Network)

 set(CMAKE_SKIP_BUILD_RPATH false)
 set(CMAKE_BUILD_RPATH_USE_ORIGIN true)
-set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
+set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib:/usr/local/lib")
 set(CMAKE_BUILD_RPATH ${CMAKE_INSTALL_RPATH})

 add_compile_definitions(BLOOM_VERSION="${CMAKE_PROJECT_VERSION}")
@@ -369,8 +369,8 @@ install(
 )

 install(
-    DIRECTORY build/lib
-    DESTINATION "."
+    DIRECTORY build/bin/lib
+    DESTINATION "bin"
    DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
 )

--- a/build/bin/lib/libQt6Core.so.6
+++ b/build/bin/lib/libQt6Core.so.6
--- a/build/bin/lib/libQt6Core.so.6.1.2
+++ b/build/bin/lib/libQt6Core.so.6.1.2
--- a/build/bin/lib/libQt6DBus.so.6
+++ b/build/bin/lib/libQt6DBus.so.6
--- a/build/bin/lib/libQt6DBus.so.6.1.2
+++ b/build/bin/lib/libQt6DBus.so.6.1.2
--- a/build/bin/lib/libQt6Gui.so
+++ b/build/bin/lib/libQt6Gui.so
--- a/build/bin/lib/libQt6Gui.so.6
+++ b/build/bin/lib/libQt6Gui.so.6
--- a/build/bin/lib/libQt6Gui.so.6.1.2
+++ b/build/bin/lib/libQt6Gui.so.6.1.2
--- a/build/bin/lib/libQt6Network.so.6
+++ b/build/bin/lib/libQt6Network.so.6
--- a/build/bin/lib/libQt6Network.so.6.1.2
+++ b/build/bin/lib/libQt6Network.so.6.1.2
--- a/build/bin/lib/libQt6OpenGL.so.6
+++ b/build/bin/lib/libQt6OpenGL.so.6
--- a/build/bin/lib/libQt6OpenGL.so.6.1.2
+++ b/build/bin/lib/libQt6OpenGL.so.6.1.2
--- a/build/bin/lib/libQt6OpenGLWidgets.so.6
+++ b/build/bin/lib/libQt6OpenGLWidgets.so.6
--- a/build/bin/lib/libQt6OpenGLWidgets.so.6.1.2
+++ b/build/bin/lib/libQt6OpenGLWidgets.so.6.1.2
--- a/build/bin/lib/libQt6Svg.so
+++ b/build/bin/lib/libQt6Svg.so
--- a/build/bin/lib/libQt6Svg.so.6
+++ b/build/bin/lib/libQt6Svg.so.6
--- a/build/bin/lib/libQt6Svg.so.6.1.2
+++ b/build/bin/lib/libQt6Svg.so.6.1.2
--- a/build/bin/lib/libQt6SvgWidgets.so.6
+++ b/build/bin/lib/libQt6SvgWidgets.so.6
--- a/build/bin/lib/libQt6SvgWidgets.so.6.1.2
+++ b/build/bin/lib/libQt6SvgWidgets.so.6.1.2
--- a/build/bin/lib/libQt6UiTools.so.6
+++ b/build/bin/lib/libQt6UiTools.so.6
--- a/build/bin/lib/libQt6UiTools.so.6.1.2
+++ b/build/bin/lib/libQt6UiTools.so.6.1.2
--- a/build/bin/lib/libQt6Widgets.so
+++ b/build/bin/lib/libQt6Widgets.so
--- a/build/bin/lib/libQt6Widgets.so.6
+++ b/build/bin/lib/libQt6Widgets.so.6
--- a/build/bin/lib/libQt6Widgets.so.6.1.2
+++ b/build/bin/lib/libQt6Widgets.so.6.1.2
--- a/build/bin/lib/libQt6XcbQpa.so.6
+++ b/build/bin/lib/libQt6XcbQpa.so.6
--- a/build/bin/lib/libQt6XcbQpa.so.6.1.2
+++ b/build/bin/lib/libQt6XcbQpa.so.6.1.2
--- a/build/bin/lib/libQt6Xml.so
+++ b/build/bin/lib/libQt6Xml.so
--- a/build/bin/lib/libQt6Xml.so.6
+++ b/build/bin/lib/libQt6Xml.so.6
--- a/build/bin/lib/libQt6Xml.so.6.1.2
+++ b/build/bin/lib/libQt6Xml.so.6.1.2
--- a/build/bin/lib/libhidapi-libusb.so.0
+++ b/build/bin/lib/libhidapi-libusb.so.0
--- a/build/bin/lib/libicudata.so.56
+++ b/build/bin/lib/libicudata.so.56
--- a/build/bin/lib/libicudata.so.56.1
+++ b/build/bin/lib/libicudata.so.56.1
--- a/build/bin/lib/libicui18n.so.56
+++ b/build/bin/lib/libicui18n.so.56
--- a/build/bin/lib/libicui18n.so.56.1
+++ b/build/bin/lib/libicui18n.so.56.1
--- a/build/bin/lib/libicuuc.so.56
+++ b/build/bin/lib/libicuuc.so.56
--- a/build/bin/lib/libicuuc.so.56.1
+++ b/build/bin/lib/libicuuc.so.56.1
--- a/build/bin/lib/libpng12.so.0
+++ b/build/bin/lib/libpng12.so.0
--- a/build/bin/lib/libpng12.so.0.54.0
+++ b/build/bin/lib/libpng12.so.0.54.0
--- a/build/bin/lib/libqxcb.so
+++ b/build/bin/lib/libqxcb.so
--- a/build/bin/lib/libqxcb.so.1
+++ b/build/bin/lib/libqxcb.so.1
--- a/build/bin/lib/libstdc++.so.6
+++ b/build/bin/lib/libstdc++.so.6
--- a/build/bin/lib/libstdc++.so.6.0.28
+++ b/build/bin/lib/libstdc++.so.6.0.28
--- a/build/bin/lib/libusb-1.0.so.0
+++ b/build/bin/lib/libusb-1.0.so.0
--- a/build/bin/lib/libxcb-xinput.so
+++ b/build/bin/lib/libxcb-xinput.so
--- a/build/bin/lib/libxcb-xinput.so.0
+++ b/build/bin/lib/libxcb-xinput.so.0
--- a/build/bin/lib/libxcb-xinput.so.0.1.0
+++ b/build/bin/lib/libxcb-xinput.so.0.1.0
--- a/build/bin/platforms/libqxcb.so
+++ b/build/bin/platforms/libqxcb.so