diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-07-15 15:48:11 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-07-15 15:22:54 +0000 |
| commit | 4a4cccc08c55b1203209ed4613e4906bb17ee56c (patch) | |
| tree | e85e5d32f3e7bddc6acdce27188bf6cc5f9f5227 /src | |
| parent | dfd2e6949b27f374f8bf0efbfd14a08fd3b23eb1 (diff) | |
Rename SKIP_AX_SERVER_REGISTRATION and QT_SKIP_AX_SERVER_REGISTRATION
Rename SKIP_AX_SERVER_REGISTRATION argument and
QT_SKIP_AX_SERVER_REGISTRATION variable to follow common naming
covention.
Pick-to: 6.2
Fixes: QTBUG-95184
Change-Id: I43c3c64bfae575903d48643ae7a9b4be99152693
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/control/Qt6AxServerMacros.cmake | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/activeqt/control/Qt6AxServerMacros.cmake b/src/activeqt/control/Qt6AxServerMacros.cmake index e09749e..0e6bcad 100644 --- a/src/activeqt/control/Qt6AxServerMacros.cmake +++ b/src/activeqt/control/Qt6AxServerMacros.cmake @@ -5,16 +5,16 @@ # This function is currently in Technical Preview. # Its signature and behavior might change. function(qt6_add_axserver_executable target) - cmake_parse_arguments(arg "SKIP_AX_SERVER_REGISTRATION" "" "" ${ARGN}) - if(arg_SKIP_AX_SERVER_REGISTRATION) - set(arg_SKIP_AX_SERVER_REGISTRATION "SKIP_AX_SERVER_REGISTRATION") + cmake_parse_arguments(arg "NO_AX_SERVER_REGISTRATION" "" "" ${ARGN}) + if(arg_NO_AX_SERVER_REGISTRATION) + set(arg_NO_AX_SERVER_REGISTRATION "NO_AX_SERVER_REGISTRATION") else() - unset(arg_SKIP_AX_SERVER_REGISTRATION) + unset(arg_NO_AX_SERVER_REGISTRATION) endif() qt_add_executable(${target} ${arg_UNPARSED_ARGUMENTS}) set_target_properties(${target} PROPERTIES WIN32_EXECUTABLE TRUE) target_link_libraries(${target} PRIVATE ${QT_CMAKE_EXPORT_NAMESPACE}::AxServer) - qt6_target_idl(${target} ${arg_SKIP_AX_SERVER_REGISTRATION}) + qt6_target_idl(${target} ${arg_NO_AX_SERVER_REGISTRATION}) endfunction() # Adds an ActiveX server library, generates an IDL file and links the produced .tbl to the @@ -24,27 +24,27 @@ endfunction() # This function is currently in Technical Preview. # Its signature and behavior might change. function(qt6_add_axserver_library target) - cmake_parse_arguments(arg "SKIP_AX_SERVER_REGISTRATION" "" "" ${ARGN}) - if(arg_SKIP_AX_SERVER_REGISTRATION) - set(arg_SKIP_AX_SERVER_REGISTRATION "SKIP_AX_SERVER_REGISTRATION") + cmake_parse_arguments(arg "NO_AX_SERVER_REGISTRATION" "" "" ${ARGN}) + if(arg_NO_AX_SERVER_REGISTRATION) + set(arg_NO_AX_SERVER_REGISTRATION "NO_AX_SERVER_REGISTRATION") else() - unset(arg_SKIP_AX_SERVER_REGISTRATION) + unset(arg_NO_AX_SERVER_REGISTRATION) endif() add_library(${target} SHARED ${arg_UNPARSED_ARGUMENTS}) target_link_libraries(${target} PRIVATE ${QT_CMAKE_EXPORT_NAMESPACE}::AxServer) - qt6_target_idl(${target} ${arg_SKIP_AX_SERVER_REGISTRATION}) + qt6_target_idl(${target} ${arg_NO_AX_SERVER_REGISTRATION}) endfunction() # Adds post-build rules to generate and link IDC/MIDL artifacts to the library or executable. # Arguments: -# SKIP_AX_SERVER_REGISTRATION skips the ActiveX server registration. -# Note: You may also use the QT_SKIP_AX_SERVER_REGISTRATION variable to globally skip +# NO_AX_SERVER_REGISTRATION skips the ActiveX server registration. +# Note: You may also use the QT_NO_AX_SERVER_REGISTRATION variable to globally skip # the ActiveX server registrations. # # This function is currently in Technical Preview. # Its signature and behavior might change. function(qt6_target_idl target) - cmake_parse_arguments(arg "SKIP_AX_SERVER_REGISTRATION" "" "" ${ARGN}) + cmake_parse_arguments(arg "NO_AX_SERVER_REGISTRATION" "" "" ${ARGN}) if(NOT WIN32) return() endif() @@ -72,7 +72,7 @@ target will be a separate file.\"") "$<IF:${have_rc_files},${rc_cmd},${no_rc_cmd}>" ) - if(NOT arg_SKIP_AX_SERVER_REGISTRATION AND NOT QT_SKIP_AX_SERVER_REGISTRATION) + if(NOT arg_NO_AX_SERVER_REGISTRATION AND NOT QT_NO_AX_SERVER_REGISTRATION) _qt_internal_wrap_tool_command(tlb_command_list APPEND "$<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::idc>" "$<TARGET_FILE:${target}>" /regserver |