diff -rupN --no-dereference qtbase-everywhere-src-5.13.2/src/corelib/Qt5CoreMacros.cmake qtbase-everywhere-src-5.13.2-new/src/corelib/Qt5CoreMacros.cmake
--- qtbase-everywhere-src-5.13.2/src/corelib/Qt5CoreMacros.cmake 2019-10-25 09:16:48.000000000 +0200
+++ qtbase-everywhere-src-5.13.2-new/src/corelib/Qt5CoreMacros.cmake 2019-12-09 14:40:43.573452459 +0100
@@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile o
endif()
set(_moc_extra_parameters_file @${_moc_parameters_file})
+ get_target_property(MOC_LOC ${Qt5Core_MOC_EXECUTABLE} IMPORTED_LOCATION)
add_custom_command(OUTPUT ${outfile}
- COMMAND ${Qt5Core_MOC_EXECUTABLE} ${_moc_extra_parameters_file}
+ COMMAND ${MOC_LOC} ${_moc_extra_parameters_file}
DEPENDS ${infile} ${moc_depends}
${_moc_working_dir}
VERBATIM)
@@ -248,8 +249,9 @@ function(QT5_ADD_BINARY_RESOURCES target
set(rc_depends ${rc_depends} ${_rc_depends})
endforeach()
+ get_target_property(RCC_LOC ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION)
add_custom_command(OUTPUT ${rcc_destination}
- COMMAND ${Qt5Core_RCC_EXECUTABLE}
+ COMMAND ${RCC_LOC}
ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles}
DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM)
add_custom_target(${target} ALL DEPENDS ${rcc_destination})
@@ -281,8 +283,9 @@ function(QT5_ADD_RESOURCES outfiles )
_QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
+ get_target_property(MOC_LOC ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION)
add_custom_command(OUTPUT ${outfile}
- COMMAND ${Qt5Core_RCC_EXECUTABLE}
+ COMMAND ${MOC_LOC}
ARGS ${rcc_options} --name ${outfilename} --output ${outfile} ${infile}
MAIN_DEPENDENCY ${infile}
DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM)
diff -rupN --no-dereference qtbase-everywhere-src-5.13.2/src/widgets/Qt5WidgetsMacros.cmake qtbase-everywhere-src-5.13.2-new/src/widgets/Qt5WidgetsMacros.cmake
--- qtbase-everywhere-src-5.13.2/src/widgets/Qt5WidgetsMacros.cmake 2019-10-25 09:16:48.000000000 +0200
+++ qtbase-everywhere-src-5.13.2-new/src/widgets/Qt5WidgetsMacros.cmake 2019-12-09 14:40:43.573452459 +0100
@@ -55,8 +55,9 @@ function(QT5_WRAP_UI outfiles )
get_filename_component(outfile ${it} NAME_WE)
get_filename_component(infile ${it} ABSOLUTE)
set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
+ get_target_property(UIC_LOC ${Qt5Widgets_UIC_EXECUTABLE} IMPORTED_LOCATION)
add_custom_command(OUTPUT ${outfile}
- COMMAND ${Qt5Widgets_UIC_EXECUTABLE}
+ COMMAND ${UIC_LOC}
ARGS ${ui_options} -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)