From eebf36adc776fde43acf69c1ff71bcf35836dbfd Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 7 Nov 2019 14:56:15 +0100 Subject: [PATCH] CMake: Make sure that explicit plugin.h files depend on the json file ClangCodeModel plugin was not updating its version number because of the EXPLICIT_MOC call. Change-Id: I109d80c93d8af628c8981d49c93dcb0ebe21f1ee Reviewed-by: Eike Ziller --- cmake/QtCreatorAPI.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index f32a8b24d54..41c9867bef5 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -171,8 +171,12 @@ function(separate_object_libraries libraries REGULAR_LIBS OBJECT_LIBS OBJECT_LIB endfunction(separate_object_libraries) function(set_explicit_moc target_name file) + unset(file_dependencies) + if (file MATCHES "^.*plugin.h$") + set(file_dependencies DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${target_name}.json") + endif() set_property(SOURCE "${file}" PROPERTY SKIP_AUTOMOC ON) - qt5_wrap_cpp(file_moc "${file}") + qt5_wrap_cpp(file_moc "${file}" ${file_dependencies}) target_sources(${target_name} PRIVATE "${file_moc}") endfunction()