qtbase: fix cmake patches to point to correct host binary directory
Signed-off-by: Simon Busch <morphis@gravedo.de>
This commit is contained in:
parent
6b39eda7a6
commit
4450a42aba
|
@ -20,7 +20,7 @@ index 4e0fcda..2bbb54c 100644
|
||||||
IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\"
|
IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\"
|
||||||
!!ELSE
|
!!ELSE
|
||||||
- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\"
|
- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\"
|
||||||
+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\"
|
+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\"
|
||||||
!!ENDIF
|
!!ENDIF
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
@ -29,7 +29,7 @@ index 4e0fcda..2bbb54c 100644
|
||||||
IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\"
|
IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\"
|
||||||
!!ELSE
|
!!ELSE
|
||||||
- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\"
|
- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\"
|
||||||
+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\"
|
+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\"
|
||||||
!!ENDIF
|
!!ENDIF
|
||||||
)
|
)
|
||||||
# For CMake automoc feature
|
# For CMake automoc feature
|
||||||
|
@ -38,7 +38,7 @@ index 4e0fcda..2bbb54c 100644
|
||||||
IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\"
|
IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\"
|
||||||
!!ELSE
|
!!ELSE
|
||||||
- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\"
|
- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\"
|
||||||
+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\"
|
+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\"
|
||||||
!!ENDIF
|
!!ENDIF
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -20,7 +20,7 @@ index a804278..a1f8492 100644
|
||||||
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ELSE
|
!!ELSE
|
||||||
- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
||||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ENDIF
|
!!ENDIF
|
||||||
_qt5_Core_check_file_exists(${imported_location})
|
_qt5_Core_check_file_exists(${imported_location})
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ index a804278..a1f8492 100644
|
||||||
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ELSE
|
!!ELSE
|
||||||
- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
||||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ENDIF
|
!!ENDIF
|
||||||
_qt5_Core_check_file_exists(${imported_location})
|
_qt5_Core_check_file_exists(${imported_location})
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ index a804278..a1f8492 100644
|
||||||
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ELSE
|
!!ELSE
|
||||||
- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ENDIF
|
!!ENDIF
|
||||||
_qt5_Core_check_file_exists(${imported_location})
|
_qt5_Core_check_file_exists(${imported_location})
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ index e01b448..2f6b8ea 100644
|
||||||
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ELSE
|
!!ELSE
|
||||||
- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
||||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ENDIF
|
!!ENDIF
|
||||||
_qt5_Core_check_file_exists(${imported_location})
|
_qt5_Core_check_file_exists(${imported_location})
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ index e01b448..2f6b8ea 100644
|
||||||
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ELSE
|
!!ELSE
|
||||||
- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
||||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ENDIF
|
!!ENDIF
|
||||||
_qt5_Core_check_file_exists(${imported_location})
|
_qt5_Core_check_file_exists(${imported_location})
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ index e01b448..2f6b8ea 100644
|
||||||
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ELSE
|
!!ELSE
|
||||||
- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\")
|
||||||
!!ENDIF
|
!!ENDIF
|
||||||
_qt5_Core_check_file_exists(${imported_location})
|
_qt5_Core_check_file_exists(${imported_location})
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue