summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-01-25 11:12:37 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-02-23 17:02:30 +0100
commit1f30bcf33618ca39c47dc1058529b55635e30aef (patch)
treeab6f07d6c8afba7d0b9bcd06b17f2b307719d8bb /src
parent700d1037aa38f71813826e5104533f357fc41e04 (diff)
Move build tools to libexec instead of the bin dir
[ChangeLog][Build System] Tools that are called by the build system and are unlikely to be called by the user are now installed to the libexec directory. This is a step towards easier co-installability of different Qt versions. Pick-to: 6.1 Task-number: QTBUG-88791 Change-Id: Id19575b5ba27795f7715e4ea6a09391b26dd4942 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/Qt6AndroidMacros.cmake2
-rw-r--r--src/gui/CMakeLists.txt2
-rw-r--r--src/tools/cmake_automoc_parser/CMakeLists.txt1
-rw-r--r--src/tools/moc/CMakeLists.txt1
-rw-r--r--src/tools/qlalr/CMakeLists.txt1
-rw-r--r--src/tools/qvkgen/CMakeLists.txt1
-rw-r--r--src/tools/rcc/CMakeLists.txt1
-rw-r--r--src/tools/tracegen/CMakeLists.txt1
-rw-r--r--src/tools/uic/CMakeLists.txt1
9 files changed, 9 insertions, 2 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake
index a71163d9f7..c520242d06 100644
--- a/src/corelib/Qt6AndroidMacros.cmake
+++ b/src/corelib/Qt6AndroidMacros.cmake
@@ -191,7 +191,7 @@ function(qt6_android_generate_deployment_settings target)
" \"qml-importscanner-binary\" : \"${qml_importscanner_binary_path_native}\",\n")
# Override rcc binary path
- set(rcc_binary_path "${QT_HOST_PATH}/${QT6_HOST_INFO_BINDIR}/rcc")
+ set(rcc_binary_path "${QT_HOST_PATH}/${QT6_HOST_INFO_LIBEXECDIR}/rcc")
if (WIN32)
string(APPEND rcc_binary_path ".exe")
endif()
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 40c373c6d9..ab8bb47d53 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -889,7 +889,7 @@ if (QT_FEATURE_vulkan)
if(NOT "${QT_HOST_PATH}" STREQUAL "")
qt_path_join(qvkgen
"${QT_HOST_PATH}"
- "${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR}"
+ "${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_LIBEXECDIR}"
"qvkgen")
else()
set(qvkgen "${QT_CMAKE_EXPORT_NAMESPACE}::qvkgen")
diff --git a/src/tools/cmake_automoc_parser/CMakeLists.txt b/src/tools/cmake_automoc_parser/CMakeLists.txt
index 31bef236e8..b5c4aba89c 100644
--- a/src/tools/cmake_automoc_parser/CMakeLists.txt
+++ b/src/tools/cmake_automoc_parser/CMakeLists.txt
@@ -5,6 +5,7 @@
qt_get_tool_target_name(target_name cmake_automoc_parser)
qt_internal_add_tool(${target_name}
BOOTSTRAP
+ INSTALL_DIR "${INSTALL_LIBEXECDIR}"
TOOLS_TARGET Core # special case
SOURCES
main.cpp
diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index 53fc4ff73b..09c4927a53 100644
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -8,6 +8,7 @@ qt_get_tool_target_name(target_name moc)
qt_internal_add_tool(${target_name}
BOOTSTRAP
TARGET_DESCRIPTION "Qt Meta Object Compiler"
+ INSTALL_DIR "${INSTALL_LIBEXECDIR}"
TOOLS_TARGET Core # special case
SOURCES
cbordevice.h
diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt
index b3dd7c28b7..1b28154695 100644
--- a/src/tools/qlalr/CMakeLists.txt
+++ b/src/tools/qlalr/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_get_tool_target_name(target_name qlalr)
qt_internal_add_tool(${target_name}
TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator"
+ INSTALL_DIR "${INSTALL_LIBEXECDIR}"
TOOLS_TARGET Core # special case
SOURCES
compress.cpp compress.h
diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt
index a6d264d53e..75ea64fda6 100644
--- a/src/tools/qvkgen/CMakeLists.txt
+++ b/src/tools/qvkgen/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_get_tool_target_name(target_name qvkgen)
qt_internal_add_tool(${target_name}
TARGET_DESCRIPTION "Qt Vulkan Header Generator"
+ INSTALL_DIR "${INSTALL_LIBEXECDIR}"
TOOLS_TARGET Gui # special case
SOURCES
qvkgen.cpp
diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt
index f9bb7025a2..8b0d9c8182 100644
--- a/src/tools/rcc/CMakeLists.txt
+++ b/src/tools/rcc/CMakeLists.txt
@@ -8,6 +8,7 @@ qt_get_tool_target_name(target_name rcc)
qt_internal_add_tool(${target_name}
BOOTSTRAP
TARGET_DESCRIPTION "Qt Resource Compiler"
+ INSTALL_DIR "${INSTALL_LIBEXECDIR}"
TOOLS_TARGET Core # special case
SOURCES
main.cpp
diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt
index ac1e11c974..1404013d28 100644
--- a/src/tools/tracegen/CMakeLists.txt
+++ b/src/tools/tracegen/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_get_tool_target_name(target_name tracegen)
qt_internal_add_tool(${target_name}
BOOTSTRAP
+ INSTALL_DIR "${INSTALL_LIBEXECDIR}"
TOOLS_TARGET Core # special case
SOURCES
etw.cpp etw.h
diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
index afda54d179..73ea838b34 100644
--- a/src/tools/uic/CMakeLists.txt
+++ b/src/tools/uic/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_get_tool_target_name(target_name uic)
qt_internal_add_tool(${target_name}
TARGET_DESCRIPTION "Qt User Interface Compiler"
+ INSTALL_DIR "${INSTALL_LIBEXECDIR}"
TOOLS_TARGET Widgets # special case
SOURCES
cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h