From ab559e25af74f6f83a4fcf4f4a19a8db5b5a89a9 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 3 Jul 2020 15:09:38 +0200 Subject: [PATCH] CMake: Support -bindir, -libdir, -*dir configure arguments Task-number: QTBUG-85373 Change-Id: I0df181cb017561c3f0af5ab3fecb76008b89c0d2 Reviewed-by: Alexandru Croitor --- cmake/QtProcessConfigureArgs.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 5d7a076ee08..1142a5c557c 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -95,6 +95,16 @@ while(configure_args) elseif(arg STREQUAL "-qt-host-path") pop_path_argument() push("-DQT_HOST_PATH=${path}") + elseif(arg MATCHES "^-host.*dir") + message(FATAL_ERROR "${arg} is not supported anymore.") + elseif(arg MATCHES + "^-(bin|lib|archdata|libexec|qml|data|doc|translation|sysconf|examples|tests)dir$") + string(TOUPPER "${CMAKE_MATCH_1}" type) + list(POP_FRONT configure_args dir) + push("-DINSTALL_${type}DIR=${dir}") + elseif(arg STREQUAL "-plugindir") + list(POP_FRONT configure_args dir) + push("-DINSTALL_PLUGINSDIR=${dir}") elseif(arg STREQUAL "--") # Everything after this argument will be passed to CMake verbatim. push(${configure_args})