diff options
Diffstat (limited to 'meta/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch')
-rw-r--r-- | meta/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch b/meta/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch new file mode 100644 index 0000000000..e734cf32f2 --- /dev/null +++ b/meta/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch @@ -0,0 +1,28 @@ +From f83817b29477f33ee3b4abf8468a7b01bb347d2b Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Tue, 10 Jan 2017 15:28:26 +0200 +Subject: [PATCH] Use external host bin path for cmake file + +Need to use ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} for cmake to find the +qscxmlc tool from correct sysroot path. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> +Change-Id: Idb814be705e9cbaad7f1e68b5d7cdb79c4b65008 +--- + src/scxml/Qt5ScxmlConfigExtras.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scxml/Qt5ScxmlConfigExtras.cmake.in b/src/scxml/Qt5ScxmlConfigExtras.cmake.in +index edb320a..ce7f2df 100644 +--- a/src/scxml/Qt5ScxmlConfigExtras.cmake.in ++++ b/src/scxml/Qt5ScxmlConfigExtras.cmake.in +@@ -40,7 +40,7 @@ if (NOT TARGET Qt5::qscxmlc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Scxml_install_prefix}/$${CMAKE_BIN_DIR}qscxmlc$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qscxmlc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qscxmlc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Scxml_check_file_exists(${imported_location}) + |