From 41eaf633d800304cfaa05a39fd3d3c3af2d3e11c Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@qt.io>
Date: Wed, 12 May 2021 09:33:50 +0200
Subject: cmake: Show qface and annotation files in the IDE

Change-Id: I9b2ef045f7ca94019440a781516a98130d6103b0
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
---
 src/ivicore/Qt6IviCoreMacros.cmake | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/ivicore/Qt6IviCoreMacros.cmake b/src/ivicore/Qt6IviCoreMacros.cmake
index 0ad7d75..7bacbcf 100644
--- a/src/ivicore/Qt6IviCoreMacros.cmake
+++ b/src/ivicore/Qt6IviCoreMacros.cmake
@@ -1,6 +1,6 @@
-function(qt6_ivigenerator target)
+function(qt6_ivigenerator generator_target)
     qt6_ivigenerator_generate(${ARGN})
-    qt6_ivigenerator_include(${target} ${ARGN})
+    qt6_ivigenerator_include(${generator_target} ${ARGN})
 endfunction()
 
 if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
@@ -66,11 +66,15 @@ function(qt6_ivigenerator_generate)
         message(FATAL_ERROR "Invalid QFACE_FORMAT: Couldn't find the template folder: ${FORMAT_PATH}")
     endif()
 
+    set(IDE_FILES)
+
     # Register all source files to cause a cmake rerun
     set(GEN_DEPENDENCIES)
     list(APPEND GEN_DEPENDENCIES ${QFACE_SOURCES})
+    list(APPEND IDE_FILES ${QFACE_SOURCES})
     if (EXISTS ${QFACE_SOURCE_ANNOTATION})
         list(APPEND GEN_DEPENDENCIES ${QFACE_SOURCE_ANNOTATION})
+        list(APPEND IDE_FILES ${QFACE_SOURCE_ANNOTATION})
     endif()
     # Also register all files which are part of the current template
     file(GLOB FORMAT_FILES ${FORMAT_PATH}/*)
@@ -86,6 +90,7 @@ function(qt6_ivigenerator_generate)
         list(APPEND GENERATOR_ARGUMENTS -A ${ANNOTATION_PATH})
         # Dependency for regeneration
         list(APPEND GEN_DEPENDENCIES ${ANNOTATION_PATH})
+        list(APPEND IDE_FILES ${ANNOTATION_PATH})
     endforeach()
 
     foreach(IMPORT ${ARG_QFACE_IMPORT_PATH})
@@ -96,6 +101,17 @@ function(qt6_ivigenerator_generate)
         list(APPEND GEN_DEPENDENCIES ${QFACE_FILES})
     endforeach()
 
+    # Show qface and annotations in IDE
+    # If the generate function is called directly ${generator_target} is not defined and we will
+    # fallback to the IDL base name
+    set(IDE_PREFIX ${generator_target})
+    if (NOT IDE_PREFIX)
+        set(IDE_PREFIX ${QFACE_BASE_NAME})
+    endif()
+    add_custom_target(${IDE_PREFIX}_qface_files SOURCES
+        ${IDE_FILES}
+    )
+
     set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${GEN_DEPENDENCIES})
 
     # If the generator was run successfully before
-- 
cgit v1.2.3