adjust the project file architecture

to make it more like a modern library project

Signed-off-by: Yuhang Zhao <2546789017@qq.com>

CMakeLists.txt

@@ -58,15 +58,7 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets)
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Quick)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick)
 
-add_subdirectory(core)
+add_subdirectory(src)
-
-if(TARGET Qt${QT_VERSION_MAJOR}::Widgets)
-    add_subdirectory(widgets)
-endif()
-
-if(TARGET Qt${QT_VERSION_MAJOR}::Quick)
-    add_subdirectory(quick)
-endif()
 
 if(FRAMELESSHELPER_BUILD_EXAMPLES)
     add_subdirectory(examples)

examples/mainwindow/CMakeLists.txt

@@ -15,7 +15,6 @@ add_executable(MainWindow WIN32 ${SOURCES})
 
 target_link_libraries(MainWindow PRIVATE
     Qt${QT_VERSION_MAJOR}::Widgets
-    FramelessHelperCore
     FramelessHelperWidgets
 )
 

examples/mainwindow/mainwindow.cpp

@@ -25,7 +25,7 @@
 #include "mainwindow.h"
 #include "ui_MainWindow.h"
 #include "ui_TitleBar.h"
-#include <utils.h>
+#include <Utils>
 
 FRAMELESSHELPER_USE_NAMESPACE
 
@@ -72,6 +72,9 @@ void MainWindow::setupUi()
     QMenuBar *mb = menuBar();
     titleBar->horizontalLayout->insertWidget(1, mb);
 
+    // This call to the setMenuWidget() function is only needed by this example
+    // application to achieve some special effects, don't use it in your own
+    // code if you don't know what's it for!
     setMenuWidget(titleBarWidget);
 
     setTitleBarWidget(titleBarWidget);

examples/mainwindow/mainwindow.h

@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <framelessmainwindow.h>
+#include <FramelessMainWindow>
 
 namespace Ui
 {

examples/quick/CMakeLists.txt

@@ -16,7 +16,6 @@ add_executable(Quick WIN32 ${SOURCES})
 target_link_libraries(Quick PRIVATE
     Qt${QT_VERSION_MAJOR}::Quick
     Qt${QT_VERSION_MAJOR}::QuickControls2
-    FramelessHelperCore
     FramelessHelperQuick
 )
 

examples/quick/main.cpp

@@ -26,7 +26,7 @@
 #include <QtQml/qqmlapplicationengine.h>
 #include <QtQuick/qquickwindow.h>
 #include <QtQuickControls2/qquickstyle.h>
-#include <framelesshelper_quick.h>
+#include <FramelessHelper_Quick>
 
 FRAMELESSHELPER_USE_NAMESPACE
 

examples/widget/CMakeLists.txt

@@ -13,7 +13,6 @@ add_executable(Widget WIN32 ${SOURCES})
 
 target_link_libraries(Widget PRIVATE
     Qt${QT_VERSION_MAJOR}::Widgets
-    FramelessHelperCore
     FramelessHelperWidgets
 )
 

examples/widget/widget.cpp

@@ -26,7 +26,7 @@
 #include <QtCore/qdatetime.h>
 #include <QtWidgets/qlabel.h>
 #include <QtWidgets/qboxlayout.h>
-#include <utils.h>
+#include <Utils>
 
 FRAMELESSHELPER_USE_NAMESPACE
 

examples/widget/widget.h

@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <framelesswidget.h>
+#include <FramelessWidget>
 
 QT_BEGIN_NAMESPACE
 class QLabel;

include/FramelessHelper/Core/FramelessHelper_Qt

@@ -0,0 +1 @@
+#include <framelesshelper_qt.h>

include/FramelessHelper/Core/FramelessHelper_Win

@@ -0,0 +1 @@
+#include <framelesshelper_win.h>

include/FramelessHelper/Core/FramelessHelper_Windows

@@ -0,0 +1 @@
+#include <framelesshelper_windows.h>

include/FramelessHelper/Core/FramelessWindowsManager

@@ -0,0 +1 @@
+#include <framelesswindowsmanager.h>

include/FramelessHelper/Core/Utils

@@ -0,0 +1 @@
+#include <utils.h>

include/FramelessHelper/Quick/FramelessHelperImageProvider

@@ -0,0 +1 @@
+#include <framelesshelperimageprovider.h>

include/FramelessHelper/Quick/FramelessHelper_Quick

@@ -0,0 +1 @@
+#include <framelesshelper_quick.h>

include/FramelessHelper/Quick/FramelessQuickEventFilter

@@ -0,0 +1 @@
+#include <framelessquickeventfilter.h>

include/FramelessHelper/Quick/FramelessQuickHelper

@@ -0,0 +1 @@
+#include <framelessquickhelper.h>

include/FramelessHelper/Quick/FramelessQuickUtils

@@ -0,0 +1 @@
+#include <framelessquickutils.h>

include/FramelessHelper/Widgets/FramelessMainWindow

@@ -0,0 +1 @@
+#include <framelessmainwindow.h>

include/FramelessHelper/Widgets/FramelessWidget

@@ -0,0 +1 @@
+#include <framelesswidget.h>

include/FramelessHelper/Widgets/FramelessWidgetsHelper

@@ -0,0 +1 @@
+#include <framelesswidgetshelper.h>

src/CMakeLists.txt

@@ -0,0 +1,9 @@
+add_subdirectory(core)
+
+if(TARGET Qt${QT_VERSION_MAJOR}::Widgets)
+    add_subdirectory(widgets)
+endif()
+
+if(TARGET Qt${QT_VERSION_MAJOR}::Quick)
+    add_subdirectory(quick)
+endif()

src/core/CMakeLists.txt

@@ -80,4 +80,6 @@ target_link_libraries(${SUB_PROJ_NAME} PRIVATE
 
 target_include_directories(${SUB_PROJ_NAME} PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/../../include/FramelessHelper/Core"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/../../include"
 )

src/quick/CMakeLists.txt

@@ -62,9 +62,14 @@ endif()
 
 target_link_libraries(${SUB_PROJ_NAME} PRIVATE
     Qt${QT_VERSION_MAJOR}::QuickPrivate
+)
+
+target_link_libraries(${SUB_PROJ_NAME} PUBLIC
     FramelessHelperCore
 )
 
 target_include_directories(${SUB_PROJ_NAME} PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/../../include/FramelessHelper/Quick"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/../../include"
 )

src/widgets/CMakeLists.txt

@@ -49,9 +49,14 @@ endif()
 
 target_link_libraries(${SUB_PROJ_NAME} PRIVATE
     Qt${QT_VERSION_MAJOR}::Widgets
+)
+
+target_link_libraries(${SUB_PROJ_NAME} PUBLIC
     FramelessHelperCore
 )
 
 target_include_directories(${SUB_PROJ_NAME} PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/../../include/FramelessHelper/Widgets"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/../../include"
 )