From 83c3f0b3bbb46f0f24243fdecf7120a2bd5b768c Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 25 Jan 2021 10:46:11 +0100
Subject: Prepare installation of tools to libexec

Add the INSTALL_DIR argument to qt_internal_add_tool to allow
installation of tools in other locations than INSTALL_BINDIR.

Task-number: QTBUG-88791
Change-Id: I88ede81a4c13c82f6d209156d3801ce130f8fc10
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit c1cbfcb38fc3aac01da8d32cb8607fad76210e29)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 cmake/QtToolHelpers.cmake | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'cmake')

diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake
index 6717465bba..25b8e4a58c 100644
--- a/cmake/QtToolHelpers.cmake
+++ b/cmake/QtToolHelpers.cmake
@@ -7,10 +7,17 @@
 #     qt_get_tool_target_name(target_name my_tool)
 #     qt_add_tool(${target_name})
 #
+# Arguments:
+#     INSTALL_DIR
+#         Takes a path, relative to the install prefix, like INSTALL_LIBEXECDIR.
+#         If this argument is omitted, the default is INSTALL_BINDIR.
+#
 function(qt_internal_add_tool target_name)
     qt_tool_target_to_name(name ${target_name})
+    set(one_value_keywords TOOLS_TARGET EXTRA_CMAKE_FILES INSTALL_DIR
+                           ${__default_target_info_args})
     qt_parse_all_arguments(arg "qt_add_tool" "BOOTSTRAP;NO_QT;NO_INSTALL"
-                               "TOOLS_TARGET;EXTRA_CMAKE_FILES;${__default_target_info_args}"
+                               "${one_value_keywords}"
                                "${__default_private_args}" ${ARGN})
 
     # Handle case when a tool does not belong to a module and it can't be built either (like
@@ -121,7 +128,12 @@ function(qt_internal_add_tool target_name)
         set(no_qt NO_QT)
     endif()
 
-    qt_internal_add_executable("${target_name}" OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+    set(install_dir "${INSTALL_BINDIR}")
+    if(arg_INSTALL_DIR)
+        set(install_dir "${arg_INSTALL_DIR}")
+    endif()
+
+    qt_internal_add_executable("${target_name}" OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${install_dir}"
         ${bootstrap}
         ${no_qt}
         NO_INSTALL
@@ -175,7 +187,7 @@ function(qt_internal_add_tool target_name)
     # ./bin, while the rest will be in <CONFIG> specific subdirectories.
     qt_get_tool_cmake_configuration(tool_cmake_configuration)
     set_target_properties("${target_name}" PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY_${tool_cmake_configuration} "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+        RUNTIME_OUTPUT_DIRECTORY_${tool_cmake_configuration} "${QT_BUILD_DIR}/${install_dir}"
     )
 
     if(NOT arg_NO_INSTALL AND arg_TOOLS_TARGET)
@@ -193,6 +205,7 @@ function(qt_internal_add_tool target_name)
         foreach(cmake_config ${cmake_configs})
             qt_get_install_target_default_args(
                 OUT_VAR install_targets_default_args
+                RUNTIME "${install_dir}"
                 CMAKE_CONFIG "${cmake_config}"
                 ALL_CMAKE_CONFIGS "${cmake_configs}")
 
@@ -212,12 +225,12 @@ function(qt_internal_add_tool target_name)
             unset(install_initial_call_args)
         endforeach()
 
-        qt_apply_rpaths(TARGET "${target_name}" INSTALL_PATH "${INSTALL_BINDIR}" RELATIVE_RPATH)
+        qt_apply_rpaths(TARGET "${target_name}" INSTALL_PATH "${install_dir}" RELATIVE_RPATH)
 
     endif()
 
-    qt_enable_separate_debug_info(${target_name} "${INSTALL_BINDIR}")
-    qt_internal_install_pdb_files(${target_name} "${INSTALL_BINDIR}")
+    qt_enable_separate_debug_info(${target_name} "${install_dir}")
+    qt_internal_install_pdb_files(${target_name} "${install_dir}")
 endfunction()
 
 function(qt_export_tools module_name)
-- 
cgit v1.2.3