From 59504865964ced9031e71614203f649b14ad4f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Sun, 8 Mar 2020 21:22:22 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@753 a8b55f48-bf90-11e4-a774-851b48703e85 --- CMakeLists.txt | 2 +- qglview/qglview.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60f801a..1eceaff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ else() link_directories(/usr/local/lib) endif() else() - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:\$ORIGIN/lib") + set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib") endif() set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1) endif() diff --git a/qglview/qglview.cpp b/qglview/qglview.cpp index 6f73dd6..abd8d3d 100644 --- a/qglview/qglview.cpp +++ b/qglview/qglview.cpp @@ -833,6 +833,7 @@ QByteArray QGLView::saveFeatures() { QByteArray ba; QDataStream ds(&ba, QIODevice::WriteOnly); ds << features_; + return ba; }