From fa5389a0fcc45c6f1bd7078224a8adb685e0999a Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: Fri, 30 Jun 2023 17:31:01 +0800
Subject: [PATCH] ci: try fix ci

---
 cmake                      |  2 +-
 src/core/CMakeLists.txt    | 15 +++++++++------
 src/quick/CMakeLists.txt   | 25 ++++++++++++++-----------
 src/widgets/CMakeLists.txt |  4 ++--
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/cmake b/cmake
index f41e3f8..69aa8ca 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit f41e3f888db144b5d30a3bd8d227905a391531f1
+Subproject commit 69aa8ca8ed5ad4b06d0bc024293641b1a14884ff
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index cfc933d..f2842a8 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -177,6 +177,8 @@ set_target_properties(${SUB_MODULE} PROPERTIES
     OUTPUT_NAME "${SUB_MODULE_FULL_NAME}"
 )
 
+set(__export_targets ${SUB_MODULE})
+
 if(NOT FRAMELESSHELPER_NO_BUNDLE_RESOURCE)
     if(QT_VERSION VERSION_GREATER_EQUAL "6.2")
         qt_add_resources(${SUB_MODULE} framelesshelpercore
@@ -188,13 +190,14 @@ if(NOT FRAMELESSHELPER_NO_BUNDLE_RESOURCE)
             OUTPUT_TARGETS __qrc_targets
         )
         if(__qrc_targets)
-            foreach(__target ${__qrc_targets})
-                if(FRAMELESSHELPER_BUILD_STATIC)
+            list(APPEND __export_targets ${__qrc_targets})
+            if(FRAMELESSHELPER_BUILD_STATIC)
+                foreach(__target ${__qrc_targets})
                     target_sources(${SUB_MODULE} PRIVATE
                         $<TARGET_OBJECTS:${__target}>
                     )
-                endif()
-            endforeach()
+                endforeach()
+            endif()
         endif()
     else()
         target_sources(${SUB_MODULE} PRIVATE
@@ -309,10 +312,10 @@ endif()
 setup_compile_params(TARGETS ${SUB_MODULE} ${__extra_flags})
 if(NOT FRAMELESSHELPER_NO_INSTALL)
     setup_package_export(
-        TARGET ${SUB_MODULE}
+        TARGETS ${__export_targets}
         NAMESPACE ${PROJECT_NAME}
         PACKAGE_NAME ${PROJECT_NAME}
-        INCLUDE_DIR ${SUB_MODULE}
+        COMPONENT ${SUB_MODULE}
         PUBLIC_HEADERS ${PUBLIC_HEADERS}
         ALIAS_HEADERS ${PUBLIC_HEADERS_ALIAS}
         PRIVATE_HEADERS ${PRIVATE_HEADERS}
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 80beeae..e398426 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -123,6 +123,8 @@ set_target_properties(${SUB_MODULE} PROPERTIES
     OUTPUT_NAME "${SUB_MODULE_FULL_NAME}"
 )
 
+set(__export_targets ${SUB_MODULE})
+
 set(__import_base_dir "${PROJECT_BINARY_DIR}/imports")
 if(DEFINED FRAMELESSHELPER_IMPORT_DIR)
     set(__import_base_dir "${FRAMELESSHELPER_IMPORT_DIR}")
@@ -147,18 +149,19 @@ if(QT_VERSION VERSION_GREATER_EQUAL "6.3")
             QtQuick.Controls.Basic/auto
     )
     if(__qml_targets)
-        foreach(__target ${__qml_targets})
-            # We have some resources bundled into the library,
-            # however, for static builds, the object files will
-            # not be packed into our final static library file,
-            # and thus it causes linker errors for our users,
-            # so we need this hack here.
-            if(FRAMELESSHELPER_BUILD_STATIC)
+        list(APPEND __export_targets ${__qml_targets})
+        # We have some resources bundled into the library,
+        # however, for static builds, the object files will
+        # not be packed into our final static library file,
+        # and thus it causes linker errors for our users,
+        # so we need this hack here.
+        if(FRAMELESSHELPER_BUILD_STATIC)
+            foreach(__target ${__qml_targets})
                 target_sources(${SUB_MODULE} PRIVATE
                     $<TARGET_OBJECTS:${__target}>
                 )
-            endif()
-        endforeach()
+            endforeach()
+        endif()
     endif()
     if(NOT FRAMELESSHELPER_NO_INSTALL)
         qt_query_qml_module(${SUB_MODULE}
@@ -292,10 +295,10 @@ endif()
 setup_compile_params(TARGETS ${SUB_MODULE} ${__extra_flags})
 if(NOT FRAMELESSHELPER_NO_INSTALL)
     setup_package_export(
-        TARGET ${SUB_MODULE}
+        TARGETS ${__export_targets}
         NAMESPACE ${PROJECT_NAME}
         PACKAGE_NAME ${PROJECT_NAME}
-        INCLUDE_DIR ${SUB_MODULE}
+        COMPONENT ${SUB_MODULE}
         PUBLIC_HEADERS ${PUBLIC_HEADERS}
         ALIAS_HEADERS ${PUBLIC_HEADERS_ALIAS}
         PRIVATE_HEADERS ${PRIVATE_HEADERS}
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index b39b6bd..3457397 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -183,10 +183,10 @@ endif()
 setup_compile_params(TARGETS ${SUB_MODULE} ${__extra_flags})
 if(NOT FRAMELESSHELPER_NO_INSTALL)
     setup_package_export(
-        TARGET ${SUB_MODULE}
+        TARGETS ${SUB_MODULE}
         NAMESPACE ${PROJECT_NAME}
         PACKAGE_NAME ${PROJECT_NAME}
-        INCLUDE_DIR ${SUB_MODULE}
+        COMPONENT ${SUB_MODULE}
         PUBLIC_HEADERS ${PUBLIC_HEADERS}
         ALIAS_HEADERS ${PUBLIC_HEADERS_ALIAS}
         PRIVATE_HEADERS ${PRIVATE_HEADERS}