From 6fe3dd108876119835884149e19d62d7bd12b889 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Mon, 23 May 2022 14:46:20 +0800
Subject: [PATCH] cmake: minor tweaks

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
---
 examples/mainwindow/CMakeLists.txt   | 2 +-
 examples/openglwidget/CMakeLists.txt | 2 +-
 examples/quick/CMakeLists.txt        | 2 +-
 examples/widget/CMakeLists.txt       | 2 +-
 src/core/CMakeLists.txt              | 6 ++++--
 src/quick/CMakeLists.txt             | 8 +++++---
 src/widgets/CMakeLists.txt           | 8 +++++---
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/examples/mainwindow/CMakeLists.txt b/examples/mainwindow/CMakeLists.txt
index d081feb..93622aa 100644
--- a/examples/mainwindow/CMakeLists.txt
+++ b/examples/mainwindow/CMakeLists.txt
@@ -46,7 +46,7 @@ set_target_properties(MainWindow PROPERTIES
 
 target_link_libraries(MainWindow PRIVATE
     Qt${QT_VERSION_MAJOR}::Widgets
-    FramelessHelperWidgets
+    FramelessHelper::Widgets
 )
 
 target_compile_definitions(MainWindow PRIVATE
diff --git a/examples/openglwidget/CMakeLists.txt b/examples/openglwidget/CMakeLists.txt
index e917d23..44273a7 100644
--- a/examples/openglwidget/CMakeLists.txt
+++ b/examples/openglwidget/CMakeLists.txt
@@ -59,7 +59,7 @@ set_target_properties(OpenGLWidget PROPERTIES
 target_link_libraries(OpenGLWidget PRIVATE
     Qt${QT_VERSION_MAJOR}::Widgets
     Qt${QT_VERSION_MAJOR}::OpenGL
-    FramelessHelperWidgets
+    FramelessHelper::Widgets
 )
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
diff --git a/examples/quick/CMakeLists.txt b/examples/quick/CMakeLists.txt
index 01b2bff..36dbf23 100644
--- a/examples/quick/CMakeLists.txt
+++ b/examples/quick/CMakeLists.txt
@@ -50,7 +50,7 @@ set_target_properties(Quick PROPERTIES
 target_link_libraries(Quick PRIVATE
     Qt${QT_VERSION_MAJOR}::Quick
     Qt${QT_VERSION_MAJOR}::QuickControls2
-    FramelessHelperQuick
+    FramelessHelper::Quick
 )
 
 target_compile_definitions(Quick PRIVATE
diff --git a/examples/widget/CMakeLists.txt b/examples/widget/CMakeLists.txt
index 5fb58c6..3eff2d4 100644
--- a/examples/widget/CMakeLists.txt
+++ b/examples/widget/CMakeLists.txt
@@ -45,7 +45,7 @@ set_target_properties(Widget PROPERTIES
 
 target_link_libraries(Widget PRIVATE
     Qt${QT_VERSION_MAJOR}::Widgets
-    FramelessHelperWidgets
+    FramelessHelper::Widgets
 )
 
 target_compile_definitions(Widget PRIVATE
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 884030a..cc1c3c8 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -28,9 +28,10 @@ if(UNIX AND NOT APPLE)
     pkg_search_module(GTK3 REQUIRED gtk+-3.0)
 endif()
 
-set(SUB_PROJ_NAME FramelessHelperCore)
+set(SUB_MOD_NAME Core)
+set(SUB_PROJ_NAME ${PROJECT_NAME}${SUB_MOD_NAME})
 
-set(INCLUDE_PREFIX ../../include/FramelessHelper/Core)
+set(INCLUDE_PREFIX ../../include/${PROJECT_NAME}/${SUB_MOD_NAME})
 
 set(SOURCES
     ${INCLUDE_PREFIX}/framelesshelpercore_global.h
@@ -69,6 +70,7 @@ if(FRAMELESSHELPER_BUILD_STATIC)
 else()
     add_library(${SUB_PROJ_NAME} SHARED ${SOURCES})
 endif()
+add_library(${PROJECT_NAME}::${SUB_MOD_NAME} ALIAS ${SUB_PROJ_NAME})
 
 if(FRAMELESSHELPER_BUILD_STATIC)
     target_compile_definitions(${SUB_PROJ_NAME} PUBLIC
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 0a4aa66..85dbd30 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -25,9 +25,10 @@
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS QuickTemplates2 QuickControls2)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS QuickTemplates2 QuickControls2)
 
-set(SUB_PROJ_NAME FramelessHelperQuick)
+set(SUB_MOD_NAME Quick)
+set(SUB_PROJ_NAME ${PROJECT_NAME}${SUB_MOD_NAME})
 
-set(INCLUDE_PREFIX ../../include/FramelessHelper/Quick)
+set(INCLUDE_PREFIX ../../include/${PROJECT_NAME}/${SUB_MOD_NAME})
 
 set(SOURCES
     framelesshelperquick.qrc
@@ -58,6 +59,7 @@ if(FRAMELESSHELPER_BUILD_STATIC)
 else()
     add_library(${SUB_PROJ_NAME} SHARED ${SOURCES})
 endif()
+add_library(${PROJECT_NAME}::${SUB_MOD_NAME} ALIAS ${SUB_PROJ_NAME})
 
 if(FRAMELESSHELPER_BUILD_STATIC)
     target_compile_definitions(${SUB_PROJ_NAME} PUBLIC
@@ -105,7 +107,7 @@ target_link_libraries(${SUB_PROJ_NAME} PRIVATE
 )
 
 target_link_libraries(${SUB_PROJ_NAME} PUBLIC
-    FramelessHelperCore
+    ${PROJECT_NAME}::Core
 )
 
 target_include_directories(${SUB_PROJ_NAME} PUBLIC
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 49225c7..aa0b519 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -22,9 +22,10 @@
   SOFTWARE.
 ]]
 
-set(SUB_PROJ_NAME FramelessHelperWidgets)
+set(SUB_MOD_NAME Widgets)
+set(SUB_PROJ_NAME ${PROJECT_NAME}${SUB_MOD_NAME})
 
-set(INCLUDE_PREFIX ../../include/FramelessHelper/Widgets)
+set(INCLUDE_PREFIX ../../include/${PROJECT_NAME}/${SUB_MOD_NAME})
 
 set(SOURCES
     ${INCLUDE_PREFIX}/framelesshelperwidgets_global.h
@@ -57,6 +58,7 @@ if(FRAMELESSHELPER_BUILD_STATIC)
 else()
     add_library(${SUB_PROJ_NAME} SHARED ${SOURCES})
 endif()
+add_library(${PROJECT_NAME}::${SUB_MOD_NAME} ALIAS ${SUB_PROJ_NAME})
 
 if(FRAMELESSHELPER_BUILD_STATIC)
     target_compile_definitions(${SUB_PROJ_NAME} PUBLIC
@@ -93,7 +95,7 @@ target_link_libraries(${SUB_PROJ_NAME} PRIVATE
 )
 
 target_link_libraries(${SUB_PROJ_NAME} PUBLIC
-    FramelessHelperCore
+    ${PROJECT_NAME}::Core
 )
 
 target_include_directories(${SUB_PROJ_NAME} PUBLIC