From 4d7469651e26d0aa42fbe1a196bcac65762610d2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 14 Mar 2022 10:53:41 +0000 Subject: sdk: support cmake builds on Windows CMake and Ninja combination does not support changing RPATH on Windows hosts, even when cross-compiling. Add CMake configuration to workaround this. Change-Id: I5d82c0a7f91cf81a0b3ed7c0f14aeccc36464f91 Reviewed-by: Mikko Gronoff (cherry picked from commit 554b947ba4e5b5bbdf6b7ca39ce8a7e44b009c8a) Reviewed-by: Qt Cherry-pick Bot --- classes/populate_sdk_qt6_base.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index 4263afb..1871081 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/classes/populate_sdk_qt6_base.bbclass @@ -120,6 +120,10 @@ function(cmake_initialize_per_config_variable _PREFIX _DOCSTRING) _cmake_initialize_per_config_variable(\${ARGV}) endfunction() +if(CMAKE_HOST_WIN32) + set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) +endif() + if(NOT DEFINED CMAKE_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT 1) endif() -- cgit v1.2.3