diff --git a/.gitmodules b/.gitmodules index 1d3a7ef..702b329 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 889a43e..0b74464 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/Patronum/CMakeLists.txt b/Patronum/CMakeLists.txt index 2917fd2..0e13dab 100755 --- a/Patronum/CMakeLists.txt +++ b/Patronum/CMakeLists.txt @@ -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) diff --git a/Patronum/QuasarAppLib b/Patronum/QuasarAppLib deleted file mode 160000 index 9fcdeb4..0000000 --- a/Patronum/QuasarAppLib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9fcdeb42dd26f76c0be350e215c0fcf044e29879 diff --git a/submodules/QuasarAppLib b/submodules/QuasarAppLib new file mode 160000 index 0000000..a23bbe9 --- /dev/null +++ b/submodules/QuasarAppLib @@ -0,0 +1 @@ +Subproject commit a23bbe92689b472c69b73d0e49646de991a0390f