summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2017-05-26 12:06:43 (GMT)
committerEike Ziller <eike.ziller@qt.io>2017-05-29 06:50:46 (GMT)
commit9cd257f6c2285b82d9cce8c2b7c1a259f6a431e3 (patch)
tree8631a2604642947c80d0bb65f3ceda676ccd2d2b
parent3835caabad9bb192e57e37c83af08c580269b9d9 (diff)
downloadqtsensors-9cd257f6c2285b82d9cce8c2b7c1a259f6a431e3.tar.gz
Fix grue sensor example building on macOS
Task-number: QTBUG-33875 Change-Id: Idd72b689aaae727df77daecb616d5c47b9bb809c Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
-rw-r--r--examples/sensors/grue/console_app/console_app.pro1
-rw-r--r--examples/sensors/grue/import/import.pro8
-rw-r--r--examples/sensors/grue/lib/lib.pri6
-rw-r--r--examples/sensors/grue/lib/lib.pro5
-rw-r--r--examples/sensors/grue/plugin/plugin.pro6
5 files changed, 19 insertions, 7 deletions
diff --git a/examples/sensors/grue/console_app/console_app.pro b/examples/sensors/grue/console_app/console_app.pro
index 3d3915f..7b082d3 100644
--- a/examples/sensors/grue/console_app/console_app.pro
+++ b/examples/sensors/grue/console_app/console_app.pro
@@ -1,6 +1,7 @@
TEMPLATE = app
TARGET = detect_grue
CONFIG += console
+CONFIG -= app_bundle
QT = core sensors
DESTDIR = $$OUT_PWD/..
diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro
index ab4d177..17d7713 100644
--- a/examples/sensors/grue/import/import.pro
+++ b/examples/sensors/grue/import/import.pro
@@ -2,16 +2,18 @@ TEMPLATE = lib
CONFIG += plugin
TARGET = $$qtLibraryTarget(declarative_grue)
-DESTDIR = ../Grue
+
+macos: DESTDIR = ../grue_app.app/Contents/MacOS/Grue
+else: DESTDIR = ../Grue
QT = core gui qml sensors
-INCLUDEPATH += $$PWD/../lib
-LIBS += -L$$OUT_PWD/.. -lgruesensor
+include(../lib/lib.pri)
# Shared gruesensor library will be installed in parent directory.
# Define rpath so that this plugin will know where to look for it.
unix:!mac: QMAKE_LFLAGS += -Wl,-rpath,\\\$\$ORIGIN/..
+macos: QMAKE_RPATHDIR += @loader_path/../../Frameworks
SOURCES = main.cpp
diff --git a/examples/sensors/grue/lib/lib.pri b/examples/sensors/grue/lib/lib.pri
new file mode 100644
index 0000000..0e3da25
--- /dev/null
+++ b/examples/sensors/grue/lib/lib.pri
@@ -0,0 +1,6 @@
+INCLUDEPATH += $$PWD
+
+macos: LIBS += -L$$OUT_PWD/../grue_app.app/Contents/Frameworks
+else: LIBS += -L$$OUT_PWD/..
+
+LIBS += -lgruesensor
diff --git a/examples/sensors/grue/lib/lib.pro b/examples/sensors/grue/lib/lib.pro
index 6106f9e..cc10e5c 100644
--- a/examples/sensors/grue/lib/lib.pro
+++ b/examples/sensors/grue/lib/lib.pro
@@ -1,7 +1,10 @@
TEMPLATE = lib
TARGET = gruesensor
-DESTDIR = $$OUT_PWD/..
+macos: DESTDIR = ../grue_app.app/Contents/Frameworks
+else: DESTDIR = $$OUT_PWD/..
+
+macos: QMAKE_SONAME_PREFIX = @rpath
DEFINES *= QT_BUILD_GRUE_LIB
QT = core sensors
diff --git a/examples/sensors/grue/plugin/plugin.pro b/examples/sensors/grue/plugin/plugin.pro
index 7edda27..e198140 100644
--- a/examples/sensors/grue/plugin/plugin.pro
+++ b/examples/sensors/grue/plugin/plugin.pro
@@ -5,10 +5,10 @@ PLUGIN_TYPE = sensors
QT = core sensors
-DESTDIR = ../$$PLUGIN_TYPE
+macos: DESTDIR = ../grue_app.app/Contents/MacOS/$$PLUGIN_TYPE
+else: DESTDIR = ../$$PLUGIN_TYPE
-INCLUDEPATH += $$PWD/../lib
-LIBS += -L$$OUT_PWD/.. -lgruesensor
+include(../lib/lib.pri)
# Shared gruesensor library will be installed in parent directory.
# Define rpath so that this plugin will know where to look for it.