diff options
Diffstat (limited to 'src/core/api/Qt6WebEngineCoreMacros.cmake')
| -rw-r--r-- | src/core/api/Qt6WebEngineCoreMacros.cmake | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/core/api/Qt6WebEngineCoreMacros.cmake b/src/core/api/Qt6WebEngineCoreMacros.cmake index ada067b3a..8bb731548 100644 --- a/src/core/api/Qt6WebEngineCoreMacros.cmake +++ b/src/core/api/Qt6WebEngineCoreMacros.cmake @@ -1,3 +1,12 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +# Install support uses the CMAKE_INSTALL_xxxDIR variables. Include this here +# so that it is more likely to get pulled in earlier at a higher level, and also +# to avoid re-including it many times later +include(GNUInstallDirs) +_qt_internal_add_deploy_support("${CMAKE_CURRENT_LIST_DIR}/Qt6WebEngineCoreDeploySupport.cmake") + function(qt6_add_webengine_dictionary) set(options) set(oneValueArgs TARGET SOURCE OUTPUT_DIRECTORY) @@ -14,11 +23,18 @@ function(qt6_add_webengine_dictionary) endif() get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + get_target_property(isBundle ${ARGS_TARGET} MACOSX_BUNDLE) if(isMultiConfig) set(spellcheckerDir ${ARGS_OUTPUT_DIRECTORY}/dict/qtwebengine_dictionaries) set(copyCommand COMMAND ${CMAKE_COMMAND} -E copy_directory ${ARGS_OUTPUT_DIRECTORY}/dict ${ARGS_OUTPUT_DIRECTORY}/$<CONFIG> ) + elseif(APPLE AND isBundle) + get_target_property(outputName ${ARGS_TARGET} OUTPUT_NAME) + if(NOT outputName) + set(outputName ${ARGS_TARGET}) + endif() + set(spellcheckerDir "${ARGS_OUTPUT_DIRECTORY}/${outputName}.app/Contents/Resources/qtwebengine_dictionaries") else() set(spellcheckerDir ${ARGS_OUTPUT_DIRECTORY}/qtwebengine_dictionaries) endif() @@ -34,18 +50,19 @@ function(qt6_add_webengine_dictionary) ${ARGS_SOURCE} ${spellcheckerDir}/${dictName}.bdic ${copyCommand} ) - if(NOT TARGET webengine_dictionaries) - add_custom_target(webengine_dictionaries) + set(global_dict_target "qtwebengine_dictionaries") + if(NOT TARGET ${global_dict_target}) + add_custom_target(${global_dict_target}) endif() # in case of large project gen target should have unique name since it can collide, use TARGET if (ARGS_TARGET) add_custom_target(gen-${ARGS_TARGET}-${dictName} DEPENDS ${spellcheckerDir}/${dictName}.bdic) add_dependencies(${ARGS_TARGET} gen-${ARGS_TARGET}-${dictName}) - add_dependencies(webengine_dictionaries gen-${ARGS_TARGET}-${dictName}) + add_dependencies(${global_dict_target} gen-${ARGS_TARGET}-${dictName}) else() add_custom_target(gen-${dictName} DEPENDS ${spellcheckerDir}/${dictName}.bdic) - add_dependencies(webengine_dictionaries gen-${dictName}) + add_dependencies(${global_dict_target} gen-${dictName}) endif() endfunction() |