QuasarApp/QuasarAppLib
4
0
Fork 0
mirror of https://github.com/QuasarApp/QuasarAppLib.git synced 2025-05-01 20:19:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25 from QuasarApp/updateCmake

Browse Source 
update cmake
This commit is contained in:
Andrei Yankovich 2021-04-01 13:52:37 +03:00 committed by GitHub
commit d011e2bada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

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

2
CMake

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

8
CMakeLists.txt
View File

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

1
DoxyStyle

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

4
doxygen.conf
View File

@ -703,7 +703,7 @@ FILE_VERSION_FILTER =
# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
# tag is left empty. # 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 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 # 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. # list). For an example see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES. # 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 # 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 # other source files which should be copied to the HTML output directory. Note