diff options
| author | ibinderwolf <daniel@bluepattern.net> | 2019-06-26 14:30:46 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-07-15 13:58:50 +0000 |
| commit | c7f882712269735ba9ad307e5d7f5e51f8f84368 (patch) | |
| tree | 9e24d613ea58610224424da9e49b99c545663585 /recipes-qt | |
| parent | 8d2e1b401987d743ebdf964927c03f41e8f60328 (diff) | |
qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 22 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch new file mode 100644 index 00000000..caf08de4 --- /dev/null +++ b/recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch @@ -0,0 +1,22 @@ +From 30d1467553f75ba94baa4569c0222c5d407f275c Mon Sep 17 00:00:00 2001 +From: ibinderwolf <daniel@bluepattern.net> +Date: Wed, 26 Jun 2019 09:46:48 +0200 +Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS + +--- + src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in b/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in +index 4907ded..34729da 100644 +--- a/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in ++++ b/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in +@@ -40,7 +40,7 @@ if (NOT TARGET Qt5::repc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5RemoteObjects_install_prefix}/$${CMAKE_BIN_DIR}repc$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}repc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/repc${OE_QMAKE_BIN_SUFFIX}\") + !!ENDIF + _qt5_RemoteObjects_check_file_exists(${imported_location}) + diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 5e6d6bdc..904390d4 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -15,6 +15,7 @@ DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" # 5.12.meta-qt5.2 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ + file://0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ " PACKAGECONFIG ??= "" |