From b71169005983f6eb9ac2e6eeb25533bf72a715d7 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Mon, 16 Jan 2023 18:38:49 +0100 Subject: [PATCH] Replace $ with $ $ is deprecated from CMake 3.0 Pick-to: 6.5 Change-Id: I1b19507a8cb3325095440e0a22fc54f9fde77e9b Reviewed-by: Alexandru Croitor --- cmake/QtAutogenHelpers.cmake | 2 +- src/corelib/Qt6CoreMacros.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtAutogenHelpers.cmake b/cmake/QtAutogenHelpers.cmake index 4a3f1dfc749..6c66c79006e 100644 --- a/cmake/QtAutogenHelpers.cmake +++ b/cmake/QtAutogenHelpers.cmake @@ -94,7 +94,7 @@ function(qt_manual_moc result) "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" outfile) list(APPEND moc_files "${outfile}") - set(moc_parameters_file "${outfile}_parameters$<$>:_$>") + set(moc_parameters_file "${outfile}_parameters$<$>:_$>") set(moc_parameters ${arg_FLAGS} -o "${outfile}" "${infile}") foreach(dir IN ITEMS ${arg_INCLUDE_DIRECTORIES}) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 5cdbdf37168..d2e42f41102 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -96,7 +96,7 @@ function(_qt_internal_create_moc_command infile outfile moc_flags moc_options string (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}") if(moc_target) - set(_moc_parameters_file ${_moc_parameters_file}$<$>:_$>) + set(_moc_parameters_file ${_moc_parameters_file}$<$>:_$>) set(targetincludes "$") set(targetdefines "$")