From 826dbd9eac2b99c25e3e97f210eec3eef90941da Mon Sep 17 00:00:00 2001
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
Date: Sat, 6 Apr 2013 13:15:07 +0200
|
Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
|
|
... to determine path to host binaries
|
|
Upstream-Status: Inappropriate [OE specific]
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
Signed-off-by: Simon Busch <morphis@gravedo.de>
|
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
|
Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2
|
---
|
src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
|
src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
|
src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
index 4c1c3a612b..8b0f6b16ee 100644
|
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
|
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
@@ -8,7 +8,7 @@ if (NOT TARGET Qt5::qmake)
|
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
!!ELSE
|
- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake${OE_QMAKE_BIN_SUFFIX}\")
|
!!ENDIF
|
_qt5_Core_check_file_exists(${imported_location})
|
|
@@ -23,7 +23,7 @@ if (NOT TARGET Qt5::moc)
|
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
!!ELSE
|
- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc${OE_QMAKE_BIN_SUFFIX}\")
|
!!ENDIF
|
_qt5_Core_check_file_exists(${imported_location})
|
|
@@ -40,7 +40,7 @@ if (NOT TARGET Qt5::rcc)
|
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
!!ELSE
|
- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc${OE_QMAKE_BIN_SUFFIX}\")
|
!!ENDIF
|
_qt5_Core_check_file_exists(${imported_location})
|
|
diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
|
index a814678f7b..8546e4b4dc 100644
|
--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
|
+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
|
@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
|
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
|
!!ELSE
|
- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml${OE_QMAKE_BIN_SUFFIX}\")
|
!!ENDIF
|
_qt5_DBus_check_file_exists(${imported_location})
|
|
@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
|
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
|
!!ELSE
|
- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp${OE_QMAKE_BIN_SUFFIX}\")
|
!!ENDIF
|
_qt5_DBus_check_file_exists(${imported_location})
|
|
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
index 83d8004a08..d0651ee44b 100644
|
--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
|
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
|
!!ELSE
|
- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic${OE_QMAKE_BIN_SUFFIX}\")
|
!!ENDIF
|
_qt5_Widgets_check_file_exists(${imported_location})
|
|
