From f0adcc3fcafdb767ec0e9428ba829997ef072b18 Mon Sep 17 00:00:00 2001 From: Nav Date: Sat, 2 Apr 2022 17:10:58 +0100 Subject: [PATCH] Moved distributed shared objects into bin --- CMakeLists.txt | 6 +++--- build/{ => bin}/lib/libQt6Core.so.6 | 0 build/{ => bin}/lib/libQt6Core.so.6.1.2 | Bin build/{ => bin}/lib/libQt6DBus.so.6 | 0 build/{ => bin}/lib/libQt6DBus.so.6.1.2 | Bin build/{ => bin}/lib/libQt6Gui.so | 0 build/{ => bin}/lib/libQt6Gui.so.6 | 0 build/{ => bin}/lib/libQt6Gui.so.6.1.2 | Bin build/{ => bin}/lib/libQt6Network.so.6 | 0 build/{ => bin}/lib/libQt6Network.so.6.1.2 | Bin build/{ => bin}/lib/libQt6OpenGL.so.6 | 0 build/{ => bin}/lib/libQt6OpenGL.so.6.1.2 | Bin build/{ => bin}/lib/libQt6OpenGLWidgets.so.6 | 0 .../lib/libQt6OpenGLWidgets.so.6.1.2 | Bin build/{ => bin}/lib/libQt6Svg.so | 0 build/{ => bin}/lib/libQt6Svg.so.6 | 0 build/{ => bin}/lib/libQt6Svg.so.6.1.2 | Bin build/{ => bin}/lib/libQt6SvgWidgets.so.6 | 0 build/{ => bin}/lib/libQt6SvgWidgets.so.6.1.2 | Bin build/{ => bin}/lib/libQt6UiTools.so.6 | 0 build/{ => bin}/lib/libQt6UiTools.so.6.1.2 | Bin build/{ => bin}/lib/libQt6Widgets.so | 0 build/{ => bin}/lib/libQt6Widgets.so.6 | 0 build/{ => bin}/lib/libQt6Widgets.so.6.1.2 | Bin build/{ => bin}/lib/libQt6XcbQpa.so.6 | 0 build/{ => bin}/lib/libQt6XcbQpa.so.6.1.2 | Bin build/{ => bin}/lib/libQt6Xml.so | 0 build/{ => bin}/lib/libQt6Xml.so.6 | 0 build/{ => bin}/lib/libQt6Xml.so.6.1.2 | Bin build/{ => bin}/lib/libhidapi-libusb.so.0 | Bin build/{ => bin}/lib/libicudata.so.56 | 0 build/{ => bin}/lib/libicudata.so.56.1 | Bin build/{ => bin}/lib/libicui18n.so.56 | 0 build/{ => bin}/lib/libicui18n.so.56.1 | Bin build/{ => bin}/lib/libicuuc.so.56 | 0 build/{ => bin}/lib/libicuuc.so.56.1 | Bin build/{ => bin}/lib/libpng12.so.0 | 0 build/{ => bin}/lib/libpng12.so.0.54.0 | Bin build/{ => bin}/lib/libqxcb.so | Bin build/{ => bin}/lib/libqxcb.so.1 | 0 build/{ => bin}/lib/libstdc++.so.6 | 0 build/{ => bin}/lib/libstdc++.so.6.0.28 | Bin build/{ => bin}/lib/libusb-1.0.so.0 | Bin build/{ => bin}/lib/libxcb-xinput.so | 0 build/{ => bin}/lib/libxcb-xinput.so.0 | 0 build/{ => bin}/lib/libxcb-xinput.so.0.1.0 | Bin build/bin/platforms/libqxcb.so | Bin 15880 -> 15880 bytes 47 files changed, 3 insertions(+), 3 deletions(-) rename build/{ => bin}/lib/libQt6Core.so.6 (100%) rename build/{ => bin}/lib/libQt6Core.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6DBus.so.6 (100%) rename build/{ => bin}/lib/libQt6DBus.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6Gui.so (100%) rename build/{ => bin}/lib/libQt6Gui.so.6 (100%) rename build/{ => bin}/lib/libQt6Gui.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6Network.so.6 (100%) rename build/{ => bin}/lib/libQt6Network.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6OpenGL.so.6 (100%) rename build/{ => bin}/lib/libQt6OpenGL.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6OpenGLWidgets.so.6 (100%) rename build/{ => bin}/lib/libQt6OpenGLWidgets.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6Svg.so (100%) rename build/{ => bin}/lib/libQt6Svg.so.6 (100%) rename build/{ => bin}/lib/libQt6Svg.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6SvgWidgets.so.6 (100%) rename build/{ => bin}/lib/libQt6SvgWidgets.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6UiTools.so.6 (100%) rename build/{ => bin}/lib/libQt6UiTools.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6Widgets.so (100%) rename build/{ => bin}/lib/libQt6Widgets.so.6 (100%) rename build/{ => bin}/lib/libQt6Widgets.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6XcbQpa.so.6 (100%) rename build/{ => bin}/lib/libQt6XcbQpa.so.6.1.2 (100%) rename build/{ => bin}/lib/libQt6Xml.so (100%) rename build/{ => bin}/lib/libQt6Xml.so.6 (100%) rename build/{ => bin}/lib/libQt6Xml.so.6.1.2 (100%) rename build/{ => bin}/lib/libhidapi-libusb.so.0 (100%) rename build/{ => bin}/lib/libicudata.so.56 (100%) rename build/{ => bin}/lib/libicudata.so.56.1 (100%) rename build/{ => bin}/lib/libicui18n.so.56 (100%) rename build/{ => bin}/lib/libicui18n.so.56.1 (100%) rename build/{ => bin}/lib/libicuuc.so.56 (100%) rename build/{ => bin}/lib/libicuuc.so.56.1 (100%) rename build/{ => bin}/lib/libpng12.so.0 (100%) rename build/{ => bin}/lib/libpng12.so.0.54.0 (100%) rename build/{ => bin}/lib/libqxcb.so (100%) rename build/{ => bin}/lib/libqxcb.so.1 (100%) rename build/{ => bin}/lib/libstdc++.so.6 (100%) rename build/{ => bin}/lib/libstdc++.so.6.0.28 (100%) rename build/{ => bin}/lib/libusb-1.0.so.0 (100%) rename build/{ => bin}/lib/libxcb-xinput.so (100%) rename build/{ => bin}/lib/libxcb-xinput.so.0 (100%) rename build/{ => bin}/lib/libxcb-xinput.so.0.1.0 (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6754fa44..c4fad43e 100755 --- 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 ) diff --git a/build/lib/libQt6Core.so.6 b/build/bin/lib/libQt6Core.so.6 similarity index 100% rename from build/lib/libQt6Core.so.6 rename to build/bin/lib/libQt6Core.so.6 diff --git a/build/lib/libQt6Core.so.6.1.2 b/build/bin/lib/libQt6Core.so.6.1.2 similarity index 100% rename from build/lib/libQt6Core.so.6.1.2 rename to build/bin/lib/libQt6Core.so.6.1.2 diff --git a/build/lib/libQt6DBus.so.6 b/build/bin/lib/libQt6DBus.so.6 similarity index 100% rename from build/lib/libQt6DBus.so.6 rename to build/bin/lib/libQt6DBus.so.6 diff --git a/build/lib/libQt6DBus.so.6.1.2 b/build/bin/lib/libQt6DBus.so.6.1.2 similarity index 100% rename from build/lib/libQt6DBus.so.6.1.2 rename to build/bin/lib/libQt6DBus.so.6.1.2 diff --git a/build/lib/libQt6Gui.so b/build/bin/lib/libQt6Gui.so similarity index 100% rename from build/lib/libQt6Gui.so rename to build/bin/lib/libQt6Gui.so diff --git a/build/lib/libQt6Gui.so.6 b/build/bin/lib/libQt6Gui.so.6 similarity index 100% rename from build/lib/libQt6Gui.so.6 rename to build/bin/lib/libQt6Gui.so.6 diff --git a/build/lib/libQt6Gui.so.6.1.2 b/build/bin/lib/libQt6Gui.so.6.1.2 similarity index 100% rename from build/lib/libQt6Gui.so.6.1.2 rename to build/bin/lib/libQt6Gui.so.6.1.2 diff --git a/build/lib/libQt6Network.so.6 b/build/bin/lib/libQt6Network.so.6 similarity index 100% rename from build/lib/libQt6Network.so.6 rename to build/bin/lib/libQt6Network.so.6 diff --git a/build/lib/libQt6Network.so.6.1.2 b/build/bin/lib/libQt6Network.so.6.1.2 similarity index 100% rename from build/lib/libQt6Network.so.6.1.2 rename to build/bin/lib/libQt6Network.so.6.1.2 diff --git a/build/lib/libQt6OpenGL.so.6 b/build/bin/lib/libQt6OpenGL.so.6 similarity index 100% rename from build/lib/libQt6OpenGL.so.6 rename to build/bin/lib/libQt6OpenGL.so.6 diff --git a/build/lib/libQt6OpenGL.so.6.1.2 b/build/bin/lib/libQt6OpenGL.so.6.1.2 similarity index 100% rename from build/lib/libQt6OpenGL.so.6.1.2 rename to build/bin/lib/libQt6OpenGL.so.6.1.2 diff --git a/build/lib/libQt6OpenGLWidgets.so.6 b/build/bin/lib/libQt6OpenGLWidgets.so.6 similarity index 100% rename from build/lib/libQt6OpenGLWidgets.so.6 rename to build/bin/lib/libQt6OpenGLWidgets.so.6 diff --git a/build/lib/libQt6OpenGLWidgets.so.6.1.2 b/build/bin/lib/libQt6OpenGLWidgets.so.6.1.2 similarity index 100% rename from build/lib/libQt6OpenGLWidgets.so.6.1.2 rename to build/bin/lib/libQt6OpenGLWidgets.so.6.1.2 diff --git a/build/lib/libQt6Svg.so b/build/bin/lib/libQt6Svg.so similarity index 100% rename from build/lib/libQt6Svg.so rename to build/bin/lib/libQt6Svg.so diff --git a/build/lib/libQt6Svg.so.6 b/build/bin/lib/libQt6Svg.so.6 similarity index 100% rename from build/lib/libQt6Svg.so.6 rename to build/bin/lib/libQt6Svg.so.6 diff --git a/build/lib/libQt6Svg.so.6.1.2 b/build/bin/lib/libQt6Svg.so.6.1.2 similarity index 100% rename from build/lib/libQt6Svg.so.6.1.2 rename to build/bin/lib/libQt6Svg.so.6.1.2 diff --git a/build/lib/libQt6SvgWidgets.so.6 b/build/bin/lib/libQt6SvgWidgets.so.6 similarity index 100% rename from build/lib/libQt6SvgWidgets.so.6 rename to build/bin/lib/libQt6SvgWidgets.so.6 diff --git a/build/lib/libQt6SvgWidgets.so.6.1.2 b/build/bin/lib/libQt6SvgWidgets.so.6.1.2 similarity index 100% rename from build/lib/libQt6SvgWidgets.so.6.1.2 rename to build/bin/lib/libQt6SvgWidgets.so.6.1.2 diff --git a/build/lib/libQt6UiTools.so.6 b/build/bin/lib/libQt6UiTools.so.6 similarity index 100% rename from build/lib/libQt6UiTools.so.6 rename to build/bin/lib/libQt6UiTools.so.6 diff --git a/build/lib/libQt6UiTools.so.6.1.2 b/build/bin/lib/libQt6UiTools.so.6.1.2 similarity index 100% rename from build/lib/libQt6UiTools.so.6.1.2 rename to build/bin/lib/libQt6UiTools.so.6.1.2 diff --git a/build/lib/libQt6Widgets.so b/build/bin/lib/libQt6Widgets.so similarity index 100% rename from build/lib/libQt6Widgets.so rename to build/bin/lib/libQt6Widgets.so diff --git a/build/lib/libQt6Widgets.so.6 b/build/bin/lib/libQt6Widgets.so.6 similarity index 100% rename from build/lib/libQt6Widgets.so.6 rename to build/bin/lib/libQt6Widgets.so.6 diff --git a/build/lib/libQt6Widgets.so.6.1.2 b/build/bin/lib/libQt6Widgets.so.6.1.2 similarity index 100% rename from build/lib/libQt6Widgets.so.6.1.2 rename to build/bin/lib/libQt6Widgets.so.6.1.2 diff --git a/build/lib/libQt6XcbQpa.so.6 b/build/bin/lib/libQt6XcbQpa.so.6 similarity index 100% rename from build/lib/libQt6XcbQpa.so.6 rename to build/bin/lib/libQt6XcbQpa.so.6 diff --git a/build/lib/libQt6XcbQpa.so.6.1.2 b/build/bin/lib/libQt6XcbQpa.so.6.1.2 similarity index 100% rename from build/lib/libQt6XcbQpa.so.6.1.2 rename to build/bin/lib/libQt6XcbQpa.so.6.1.2 diff --git a/build/lib/libQt6Xml.so b/build/bin/lib/libQt6Xml.so similarity index 100% rename from build/lib/libQt6Xml.so rename to build/bin/lib/libQt6Xml.so diff --git a/build/lib/libQt6Xml.so.6 b/build/bin/lib/libQt6Xml.so.6 similarity index 100% rename from build/lib/libQt6Xml.so.6 rename to build/bin/lib/libQt6Xml.so.6 diff --git a/build/lib/libQt6Xml.so.6.1.2 b/build/bin/lib/libQt6Xml.so.6.1.2 similarity index 100% rename from build/lib/libQt6Xml.so.6.1.2 rename to build/bin/lib/libQt6Xml.so.6.1.2 diff --git a/build/lib/libhidapi-libusb.so.0 b/build/bin/lib/libhidapi-libusb.so.0 similarity index 100% rename from build/lib/libhidapi-libusb.so.0 rename to build/bin/lib/libhidapi-libusb.so.0 diff --git a/build/lib/libicudata.so.56 b/build/bin/lib/libicudata.so.56 similarity index 100% rename from build/lib/libicudata.so.56 rename to build/bin/lib/libicudata.so.56 diff --git a/build/lib/libicudata.so.56.1 b/build/bin/lib/libicudata.so.56.1 similarity index 100% rename from build/lib/libicudata.so.56.1 rename to build/bin/lib/libicudata.so.56.1 diff --git a/build/lib/libicui18n.so.56 b/build/bin/lib/libicui18n.so.56 similarity index 100% rename from build/lib/libicui18n.so.56 rename to build/bin/lib/libicui18n.so.56 diff --git a/build/lib/libicui18n.so.56.1 b/build/bin/lib/libicui18n.so.56.1 similarity index 100% rename from build/lib/libicui18n.so.56.1 rename to build/bin/lib/libicui18n.so.56.1 diff --git a/build/lib/libicuuc.so.56 b/build/bin/lib/libicuuc.so.56 similarity index 100% rename from build/lib/libicuuc.so.56 rename to build/bin/lib/libicuuc.so.56 diff --git a/build/lib/libicuuc.so.56.1 b/build/bin/lib/libicuuc.so.56.1 similarity index 100% rename from build/lib/libicuuc.so.56.1 rename to build/bin/lib/libicuuc.so.56.1 diff --git a/build/lib/libpng12.so.0 b/build/bin/lib/libpng12.so.0 similarity index 100% rename from build/lib/libpng12.so.0 rename to build/bin/lib/libpng12.so.0 diff --git a/build/lib/libpng12.so.0.54.0 b/build/bin/lib/libpng12.so.0.54.0 similarity index 100% rename from build/lib/libpng12.so.0.54.0 rename to build/bin/lib/libpng12.so.0.54.0 diff --git a/build/lib/libqxcb.so b/build/bin/lib/libqxcb.so similarity index 100% rename from build/lib/libqxcb.so rename to build/bin/lib/libqxcb.so diff --git a/build/lib/libqxcb.so.1 b/build/bin/lib/libqxcb.so.1 similarity index 100% rename from build/lib/libqxcb.so.1 rename to build/bin/lib/libqxcb.so.1 diff --git a/build/lib/libstdc++.so.6 b/build/bin/lib/libstdc++.so.6 similarity index 100% rename from build/lib/libstdc++.so.6 rename to build/bin/lib/libstdc++.so.6 diff --git a/build/lib/libstdc++.so.6.0.28 b/build/bin/lib/libstdc++.so.6.0.28 similarity index 100% rename from build/lib/libstdc++.so.6.0.28 rename to build/bin/lib/libstdc++.so.6.0.28 diff --git a/build/lib/libusb-1.0.so.0 b/build/bin/lib/libusb-1.0.so.0 similarity index 100% rename from build/lib/libusb-1.0.so.0 rename to build/bin/lib/libusb-1.0.so.0 diff --git a/build/lib/libxcb-xinput.so b/build/bin/lib/libxcb-xinput.so similarity index 100% rename from build/lib/libxcb-xinput.so rename to build/bin/lib/libxcb-xinput.so diff --git a/build/lib/libxcb-xinput.so.0 b/build/bin/lib/libxcb-xinput.so.0 similarity index 100% rename from build/lib/libxcb-xinput.so.0 rename to build/bin/lib/libxcb-xinput.so.0 diff --git a/build/lib/libxcb-xinput.so.0.1.0 b/build/bin/lib/libxcb-xinput.so.0.1.0 similarity index 100% rename from build/lib/libxcb-xinput.so.0.1.0 rename to build/bin/lib/libxcb-xinput.so.0.1.0 diff --git a/build/bin/platforms/libqxcb.so b/build/bin/platforms/libqxcb.so index 72a555b7081d64cd2a8286bad470ed57617cc2ad..84bea0f559a8d5521301de4bca8041d37529d9dd 100755 GIT binary patch delta 76 ccmeCE>8RP@!9BT&TgaLrf^4vPDtECF0QcS+VE_OC delta 90 zcmeCE>8RP@!R@Q3r=OFVWTl^xpPQ