summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-01-06 17:45:24 +0100
committerStanislaw Halik <sthalik@misaki.pl>2014-01-06 17:45:24 +0100
commit42dbcea956b63867c741d509a5182ae56552b561 (patch)
treecd67f91332846843bc4b0f6ea914310259ea34e6
parent5f14d59ba285c72682e99c0fb95310f5920898de (diff)
parent59d7366bcd79aa1bb4bb12876036a1c434683630 (diff)
Merge branch 'master' of github.com:opentrack/opentrack
-rw-r--r--CMakeLists.txt18
-rwxr-xr-xinstall-fail-tool6
2 files changed, 7 insertions, 17 deletions
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