diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-11-10 12:53:22 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-11-10 16:01:55 +0200 |
| commit | 73b8e196ae50eb94eb26afd7589cb4b986e6ee34 (patch) | |
| tree | 5b8ab16c6100ef54a54f6fc3364a21365901331d | |
| parent | 60567b9efcb4f862e9a4a1277fdc78e750b4a75c (diff) | |
sdk: override CMake install prefix
On Windows, the default CMAKE_INSTALL_PREFIX points to C:\Program Files\
or similar Windows specific path which breaks deployment to remote linux
device. Override the initial CMAKE_INSTALL_PREFIX with the prefix used
in the yocto builds, usually /usr.
Fixes: QTBUG-108318
Change-Id: Id175fc421b668bb87881c4b8fd632021d510cf05
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass index 484cd2f4..4b1ec5db 100644 --- a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass +++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass @@ -89,6 +89,10 @@ EOF echo "set(CMAKE_C_FLAGS \"\${compiler_flags}\")" >> ${MACHINE_CMAKE} echo "set(CMAKE_CXX_FLAGS \"\${compiler_flags}\")" >> ${MACHINE_CMAKE} echo "set(OE_QMAKE_PATH_EXTERNAL_HOST_BINS ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS})" >> ${MACHINE_CMAKE} + echo "if(NOT DEFINED CMAKE_INSTALL_PREFIX)" >> ${MACHINE_CMAKE} + echo " set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT 1)" >> ${MACHINE_CMAKE} + echo "endif()" >> ${MACHINE_CMAKE} + echo "set(CMAKE_INSTALL_PREFIX "${prefix}" CACHE PATH "Install path prefix")" >> ${MACHINE_CMAKE} } create_sdk_files_append_sdkmingw32 () { |