From 3bcb89fb84a6fc739eddc6bb3cd1bd30b90e9f76 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Tue, 23 Jun 2020 21:03:04 -0700
Subject: [PATCH] Set rpath on all unix platforms to $ORIGIN (#2299)

* Set rpath on all unix platforms to $ORIGIN

Will make it possible to extract JNI libraries easier
---
 shared/config.gradle | 12 ++++++++----
 shared/opencv.gradle |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/shared/config.gradle b/shared/config.gradle
index 625b9650ff..4c9abe7f35 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -9,9 +9,9 @@ nativeUtils {
     configureDependencies {
       wpiVersion = "-1"
       niLibVersion = "2020.10.1"
-      opencvVersion = "3.4.7-2"
+      opencvVersion = "3.4.7-3"
       googleTestVersion = "1.9.0-4-437e100-1"
-      imguiVersion = "1.72b-3"
+      imguiVersion = "1.72b-4"
     }
   }
 }
@@ -21,8 +21,12 @@ nativeUtils.wpi.addWarningsAsErrors()
 
 nativeUtils.setSinglePrintPerPlatform()
 
-nativeUtils.platformConfigs.named("osxx86-64").configure {
-    it.linker.args << "-headerpad_max_install_names"
+nativeUtils.platformConfigs.each {
+    if (it.name.contains('windows')) return
+    it.linker.args << '-Wl,-rpath,\'$ORIGIN\''
+    if (it.name == 'osxx86-64') {
+        it.linker.args << "-headerpad_max_install_names"
+    }
 }
 
 model {
diff --git a/shared/opencv.gradle b/shared/opencv.gradle
index ca3764d2d6..c5234d997c 100644
--- a/shared/opencv.gradle
+++ b/shared/opencv.gradle
@@ -1,4 +1,4 @@
-def opencvVersion = '3.4.7-2'
+def opencvVersion = '3.4.7-3'
 
 if (project.hasProperty('useCpp') && project.useCpp) {
     model {