Merge pull request #25 from QuasarApp/updateCmake

update cmake

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "CMake"]
 	path = CMake
 	url = https://github.com/QuasarApp/CMake.git
-[submodule "DoxyStyle"]
-	path = DoxyStyle
-	url = https://github.com/QuasarApp/DoxyStyle.git

CMake

@@ -1 +1 @@
-Subproject commit 30b2e07c474ab032dd120475b0a2a4cca6012fe7
+Subproject commit c988ce28e9132f9a9fe8cb9503c27d16d79d05d4

CMakeLists.txt

@@ -27,17 +27,13 @@ include(CMake/ProjectOut.cmake)
 include(CMake/ccache.cmake)
 include(CMake/Version.cmake)
 include(CMake/QuasarAppCITargets.cmake)
+include(CMake/QtUtils.cmake)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-if (NOT QT_VERSION_MAJOR)
-    find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
-endif ()
+includeQt(Core)
 
 file(GLOB SOURCE_CPP
     "*.cpp"

DoxyStyle

@@ -1 +0,0 @@
-Subproject commit b3d27bf1bac532d6a2284cbcc9fb5134778c6440

doxygen.conf

@@ -703,7 +703,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            = DoxyStyle/DoxygenLayout.xml
+LAYOUT_FILE            = CMake/DoxyStyle/DoxygenLayout.xml
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -1193,7 +1193,7 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = DoxyStyle/doxygenStyles.css 
+HTML_EXTRA_STYLESHEET  = CMake/DoxyStyle/doxygenStyles.css 
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note