summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-04-13 18:23:54 +0200
committerAlexey Edelev <alexey.edelev@qt.io>2021-04-27 15:54:16 +0200
commitf85cb33f0e9896a39ef1a7605db379178dbef112 (patch)
tree27a8d63f5b9468096401a521730a0485822081a6 /src/tools
parentc4623d4296f0a5502cba5f2395b97bd28a83dd6f (diff)
Implement CMake functions to work with IDC
In qmake we have an implicit execution of IDC in case the axserver config is enabled. This quite difficult to implement using CMake. This adds the following CMake functions to work with IDC: - The qt6_add_axserver_executable function adds axserver executable, generates IDL file and link the produced .tbl to the executable. - The qt6_add_axserver_library function adds axserver library, generates IDL file and link the produced .tbl to the dll. - The qt6_target_idl generates IDL file and link the produced .tbl to the executable for the existing target. This also introduces the QT_SKIP_AX_SERVER_REGISTRATION variable, which disables global registration of ActiveX servers. Change-Id: I5695db9d67dac07747894fd4bb37c3e6db408035 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/idc/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt
index d21b9f0..19784db 100644
--- a/src/tools/idc/CMakeLists.txt
+++ b/src/tools/idc/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_get_tool_target_name(target_name idc)
qt_internal_add_tool(${target_name} # special case
# BOOTSTRAP # special case
TARGET_DESCRIPTION "Active Qt Interface Description Compiler"
- TOOLS_TARGET AxContainer # special case
+ TOOLS_TARGET AxServer # special case
SOURCES
main.cpp
)