From 9490813ba7283a5f4caf178808907177357cd5c8 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 24 Nov 2013 05:58:23 +0100
Subject: initial version of the rpath fixer for osx

---
 install-fail-tool | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100755 install-fail-tool

(limited to 'install-fail-tool')

diff --git a/install-fail-tool b/install-fail-tool
new file mode 100755
index 00000000..910d9cc4
--- /dev/null
+++ b/install-fail-tool
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+test -n "$1" || exit 1
+
+dir="$1"
+
+for i in "$dir"/*.dylib; do
+	echo ---- $i ----
+
+	install_name_tool -id "@executable_path/$(basename -- "$i")" "$i"
+
+	otool -L "$i" | awk '$1 ~ /\.dylib$/ { print $1 }' |
+	while read l; do
+		j="$(basename -- "$l")"
+		if test -e "$dir/$j"; then
+			install_name_tool -change "$l" "@executable_path/$j" "$i"
+		fi
+	done
+done
-- 
cgit v1.2.3


From c21a454b0ffea54283cc8b1f4f9e5be761d2f8f4 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 24 Nov 2013 06:06:24 +0100
Subject: install-fail-tool: also process main executable

---
 install-fail-tool | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'install-fail-tool')

diff --git a/install-fail-tool b/install-fail-tool
index 910d9cc4..be80dd12 100755
--- a/install-fail-tool
+++ b/install-fail-tool
@@ -4,7 +4,7 @@ test -n "$1" || exit 1
 
 dir="$1"
 
-for i in "$dir"/*.dylib; do
+for i in "$dir"/*.dylib "$dir"/opentrack; do
 	echo ---- $i ----
 
 	install_name_tool -id "@executable_path/$(basename -- "$i")" "$i"
-- 
cgit v1.2.3


From 59d7366bcd79aa1bb4bb12876036a1c434683630 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 6 Jan 2014 17:44:21 +0100
Subject: fix Apple

---
 CMakeLists.txt    | 18 ++++--------------
 install-fail-tool |  6 +++---
 2 files changed, 7 insertions(+), 17 deletions(-)

(limited to 'install-fail-tool')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 776473b6..149dfc21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,21 +308,11 @@ if(WIN32)
     set(my-qt-deps ws2_32)
 endif()
 
-if(APPLE)
-    link_directories(${CMAKE_INSTALL_PREFIX})
-    set(maybe-hatire)
-    if(SDK_HATIRE)
-        set(maybe-hatire Qt5SerialPort)
-    endif()
-    set(MY_QT_LIBS Qt5Widgets Qt5Gui Qt5Network Qt5Xml Qt5Core ${maybe-hatire} ${my-qt-deps})
-else()
-    set(maybe-hatire)
-    if(SDK_HATIRE)
-        set(maybe-hatire ${Qt5SerialPort_LIBRARIES})
-    endif()
-    SET(MY_QT_LIBS ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES}
-        ${Qt5Network_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Core_LIBRARIES} ${maybe-hatire} ${my-qt-deps})
+set(maybe-hatire)
+if(SDK_HATIRE)
+set(maybe-hatire ${Qt5SerialPort_LIBRARIES})
 endif()
+set(MY_QT_LIBS ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Core_LIBRARIES} ${maybe-hatire} ${my-qt-deps})
 
 add_library(opentrack-csv SHARED ${opentrack-csv-c})
 target_link_libraries(opentrack-csv ${MY_QT_LIBS})
diff --git a/install-fail-tool b/install-fail-tool
index be80dd12..99f8fbdf 100755
--- a/install-fail-tool
+++ b/install-fail-tool
@@ -4,12 +4,12 @@ test -n "$1" || exit 1
 
 dir="$1"
 
-for i in "$dir"/*.dylib "$dir"/opentrack; do
+for i in "$dir"/* "$dir"/*/*; do
+	{ test -x "$i" && test -f "$i"; } || continue
 	echo ---- $i ----
-
 	install_name_tool -id "@executable_path/$(basename -- "$i")" "$i"
 
-	otool -L "$i" | awk '$1 ~ /\.dylib$/ { print $1 }' |
+	otool -L "$i" | awk '{ print $1 }' |
 	while read l; do
 		j="$(basename -- "$l")"
 		if test -e "$dir/$j"; then
-- 
cgit v1.2.3