diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-02-06 16:46:41 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-02-07 14:33:20 +0000 |
| commit | 2f7cd5457c5bc7e3e3a1cc94ae89680ab66f0bd8 (patch) | |
| tree | fcca4a7bdb0b1ef9090826a6342dfc37b511b389 /src/qml/Qt6QmlMacros.cmake | |
| parent | 44c9644ca0cc6d3aaa926076f08dae5f8ca957b6 (diff) | |
Do not replace PATH when running qmltyperegistrar
Change-Id: Id23574627470e1e53a71a28bbc72980aab74b54c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/qml/Qt6QmlMacros.cmake')
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 52da316952..ca13b012a1 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -543,6 +543,7 @@ function(qt6_qml_type_registration target) OUTPUT "${foreign_types_file}" DEPENDS "${QT_QMTYPES_RESOLVE_DEPENDENCIES_SCRIPT}" COMMAND ${CMAKE_COMMAND} + -DOUTPUT_FILE:PATH="${foreign_types_file}" ${foreign_types_common_args} ${foreign_types_dependency_args} @@ -576,18 +577,22 @@ function(qt6_qml_type_registration target) set(registration_cpp_file_dep_args DEPFILE ${dependency_file_cpp}) endif() + set(extra_env_command) + if (WIN32) + file(TO_NATIVE_PATH "${${PROJECT_NAME}_BINARY_DIR}/bin$<SEMICOLON>${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}$<SEMICOLON>%PATH%" env_path_native) + set(extra_env_command COMMAND set PATH=${env_path_native}) + endif() add_custom_command(OUTPUT ${type_registration_cpp_file} DEPENDS ${foreign_types_file} ${target_metatypes_json_file} ${QT_CMAKE_EXPORT_NAMESPACE}::qmltyperegistrar + ${extra_env_command} COMMAND - ${CMAKE_COMMAND} -E env PATH=${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR} $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::qmltyperegistrar> ${cmd_args} -o ${type_registration_cpp_file} ${target_metatypes_json_file} - COMMAND_EXPAND_LISTS ${registration_cpp_file_dep_args} COMMENT "Automatic QML type registration for target ${target}" ) |