diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-04-15 12:46:56 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-05-04 17:47:03 +0200 |
| commit | cefb362499692479878ef11273af43dd6e1d34ef (patch) | |
| tree | 1b856f3f047344a850b8a498fda8d86dc2d4351c /src | |
| parent | 07c17ec55b44d895a38b53dcba7c446870880e6c (diff) | |
| download | qtactiveqt-cefb362499692479878ef11273af43dd6e1d34ef.tar.gz | |
Use qt_internal_wrap_tool_command to safely pass environment for idc
Change-Id: I3994594b64869d24a1eb24c3c5cbcbe9fba6e5ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/control/Qt6AxServerMacros.cmake | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/activeqt/control/Qt6AxServerMacros.cmake b/src/activeqt/control/Qt6AxServerMacros.cmake index 6956f45..a2b37a4 100644 --- a/src/activeqt/control/Qt6AxServerMacros.cmake +++ b/src/activeqt/control/Qt6AxServerMacros.cmake @@ -69,11 +69,14 @@ function(qt6_target_idl target) set(output_tlb "${CMAKE_CURRENT_BINARY_DIR}/${target}$<CONFIG>.tlb") set(tlb_command_list "") - list(APPEND tlb_command_list ${QT_TOOL_PATH_SETUP_COMMAND}) - list(APPEND tlb_command_list COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::idc - "$<TARGET_FILE:${target}>" /idl "${output_idl}" -version 1.0 + _qt_internal_wrap_tool_command(tlb_command_list APPEND + "$<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::idc>" "$<TARGET_FILE:${target}>" + /idl "${output_idl}" -version 1.0 + ) + + _qt_internal_wrap_tool_command(tlb_command_list APPEND + midl "${output_idl}" /nologo /tlb "${output_tlb}" ) - list(APPEND tlb_command_list COMMAND midl "${output_idl}" /nologo /tlb "${output_tlb}") get_target_property(sources ${target} "SOURCES") set(has_rc FALSE) @@ -84,7 +87,8 @@ function(qt6_target_idl target) endif() endforeach() if(has_rc) - list(APPEND tlb_command_list COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::idc + _qt_internal_wrap_tool_command(tlb_command_list APPEND + "$<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::idc>" "$<TARGET_FILE:${target}>" /tlb "${output_tlb}" ) else() @@ -96,8 +100,9 @@ target will be a separate file." endif() if(NOT arg_SKIP_AX_SERVER_REGISTRATION AND NOT QT_SKIP_AX_SERVER_REGISTRATION) - list(APPEND tlb_command_list COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::idc - "$<TARGET_FILE:${target}>" /regserver + _qt_internal_wrap_tool_command(tlb_command_list APPEND + "$<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::idc>" + "$<TARGET_FILE:${target}>" /regserver ) endif() add_custom_command(TARGET ${target} POST_BUILD |