From 32d68e08a2fc3e09115b4885bf8c565913ce7074 Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Fri, 27 Aug 2021 10:06:51 +0300 Subject: QtSensors Grue example app Linux support The grue example did not find the grue plugin out of the box on Linux. This commit adjusts the plugin and detect_grue app build destinations. Task-number: QTBUG-92514 Change-Id: I53be1e96fa50599545a276c38c37957a4fc56fac Reviewed-by: Alexandru Croitor (cherry picked from commit 925b7214097ddaf803f70560851928567bc24a9a) Reviewed-by: Qt Cherry-pick Bot --- examples/sensors/grue/console_app/CMakeLists.txt | 2 +- examples/sensors/grue/plugin/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/sensors/grue/console_app/CMakeLists.txt b/examples/sensors/grue/console_app/CMakeLists.txt index 69a3f68c..de09ef49 100644 --- a/examples/sensors/grue/console_app/CMakeLists.txt +++ b/examples/sensors/grue/console_app/CMakeLists.txt @@ -25,7 +25,7 @@ set_target_properties(detect_grue PROPERTIES MACOSX_BUNDLE FALSE ) -if(WIN32) +if(WIN32 OR (UNIX AND NOT APPLE)) set_target_properties(detect_grue PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/.. ) diff --git a/examples/sensors/grue/plugin/CMakeLists.txt b/examples/sensors/grue/plugin/CMakeLists.txt index e8a016e6..91b759a0 100644 --- a/examples/sensors/grue/plugin/CMakeLists.txt +++ b/examples/sensors/grue/plugin/CMakeLists.txt @@ -33,7 +33,7 @@ set_target_properties(qtsensors_grue PROPERTIES MACOSX_BUNDLE TRUE ) -if(WIN32) +if(WIN32 OR (UNIX AND NOT APPLE)) set_target_properties(qtsensors_grue PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../sensors ) -- cgit v1.2.3