fix: set proper runpath on linux for all executables

craftablescience · Jun 14, 2024 · 3bc4c24 · 3bc4c24
1 parent 4dadfdf
commit 3bc4c24
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,6 +42,11 @@ option(VPKEDIT_USE_LTO "Build VPKEdit with link-time optimization enabled" OFF)
 
 # Global CMake options
 if(PROJECT_IS_TOP_LEVEL)
+    # Set proper runpath
+    set(CMAKE_SKIP_BUILD_RPATH OFF)
+    set(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
+    set(CMAKE_INSTALL_RPATH $ORIGIN)
+
     # Compile with PIC
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 

diff --git a/src/gui/_gui.cmake b/src/gui/_gui.cmake
@@ -1,7 +1,3 @@
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(CMAKE_BUILD_RPATH_USE_ORIGIN TRUE)
-set(CMAKE_INSTALL_RPATH $ORIGIN)
-
 # discord-rpc
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/thirdparty/discord")
 

diff --git a/src/gui/previews/MDLPreview.cpp b/src/gui/previews/MDLPreview.cpp
@@ -390,7 +390,7 @@ void MDLWidget::mouseMoveEvent(QMouseEvent* event) {
 	}
 
 	QVector3D inputAxis;
-	if (!rmbBeingHeld) {
+	if (!this->rmbBeingHeld) {
 		// Rotation axis is perpendicular to the mouse position difference vector
 		inputAxis = QVector3D(diff.y(), diff.x(), 0.0).normalized();
 	} else {