Merge pull request #19 from QuasarApp/task_18
All checks were successful
buildbot/DocsGenerator Build finished.
buildbot/AndroidBuilder_v8Qt6 Build finished.
buildbot/LinuxCMakeBuilderQt6 Build finished.
buildbot/WindowsCMakeBuilder Build finished.
buildbot/IOSCMakeBuilder Build finished.

Move submodule
This commit is contained in:
Andrei Yankovich 2023-09-30 10:25:42 +03:00 committed by GitHub
commit 597e03f761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 7 deletions

6
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "Patronum/QuasarAppLib"]
path = Patronum/QuasarAppLib
url = https://github.com/QuasarApp/QuasarAppLib.git
[submodule "submodules/QuasarAppLib"]
path = submodules/QuasarAppLib
url = https://github.com/QuasarApp/QuasarAppLib.git

View File

@ -13,8 +13,17 @@ if(TARGET ${PROJECT_NAME})
endif()
include(Patronum/QuasarAppLib/CMake/QuasarApp.cmake)
include(submodules/QuasarAppLib/CMake/QuasarApp.cmake)
# Add sub directories
if (IOS)
message("The ios not support QProcess class.")
initAll()
return()
endif()
add_subdirectory(submodules/QuasarAppLib)
add_subdirectory(Patronum)
if (NOT DEFINED PATRONUM_TESTS)
@ -38,7 +47,6 @@ else()
message("The ${PROJECT_NAME} tests is disabled.")
endif()
include(Patronum/QuasarAppLib/CMake/QuasarAppCITargets.cmake)
initAll()
addDoc("Patronum" ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)

View File

@ -20,7 +20,6 @@ updateGitVars()
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Network REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network REQUIRED)
add_subdirectory(QuasarAppLib)
add_definitions(-DPATRONUM_LIBRARY)

@ -1 +0,0 @@
Subproject commit 9fcdeb42dd26f76c0be350e215c0fcf044e29879

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