mirror of
https://github.com/QuasarApp/Patronum.git
synced 2025-05-09 21:49:35 +00:00
fix tests
This commit is contained in:
parent
ad874ca26d
commit
474c57d7eb
4
.gitmodules
vendored
4
.gitmodules
vendored
@ -1,6 +1,4 @@
|
||||
[submodule "Patronum/QuasarAppLib"]
|
||||
path = Patronum/QuasarAppLib
|
||||
url = https://github.com/QuasarApp/QuasarAppLib.git
|
||||
[submodule "res/DoxyStyle"]
|
||||
path = res/DoxyStyle
|
||||
url = https://github.com/QuasarApp/DoxyStyle.git
|
||||
|
||||
|
@ -17,10 +17,21 @@ include(Patronum/QuasarAppLib/CMake/ccache.cmake)
|
||||
# Add sub directories
|
||||
add_subdirectory(Patronum)
|
||||
|
||||
if (NOT ${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32" AND NOT ANDROID)
|
||||
set(BuildTests ON)
|
||||
if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
|
||||
if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32")
|
||||
set(BuildTests OFF)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (ANDROID)
|
||||
set(BuildTests OFF)
|
||||
endif()
|
||||
|
||||
if (BuildTests)
|
||||
add_subdirectory(Tests)
|
||||
else()
|
||||
message("The ${PROJECT_NAME} tests is disable because you use the android or wasm32 build.")
|
||||
message("The ${PROJECT_NAME} tests is disabled.")
|
||||
endif()
|
||||
|
||||
include(Patronum/QuasarAppLib/CMake/QuasarAppCITargets.cmake)
|
||||
|
@ -19,11 +19,8 @@ set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
|
||||
if (NOT QT_VERSION_MAJOR)
|
||||
|
||||
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Network REQUIRED)
|
||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network REQUIRED)
|
||||
endif ()
|
||||
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Network REQUIRED)
|
||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network REQUIRED)
|
||||
|
||||
add_subdirectory(QuasarAppLib)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 30b3669ce470072c2d722397bc5ba34b9a4c1798
|
||||
Subproject commit 80661ff685b9eb7fd0fa854d07c5a670d5fd4143
|
@ -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 = /res/DoxyStyle/DoxygenLayout.xml
|
||||
LAYOUT_FILE = /Patronum/QuasarAppLib/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
|
||||
@ -790,7 +790,7 @@ WARN_LOGFILE =
|
||||
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
|
||||
# Note: If this tag is empty the current directory is searched.
|
||||
|
||||
INPUT = ./ \
|
||||
INPUT = ./README.md \
|
||||
Patronum/src
|
||||
|
||||
# This tag can be used to specify the character encoding of the source files
|
||||
@ -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 = res/DoxyStyle/doxygenStyles.css
|
||||
HTML_EXTRA_STYLESHEET = Patronum/QuasarAppLib/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
|
||||
|
@ -1 +0,0 @@
|
||||
Subproject commit 4592500f3efd49f6f404598523e09bc031368db0
|
Loading…
x
Reference in New Issue
Block a user