4
0
mirror of https://github.com/QuasarApp/Patronum.git synced 2025-05-04 19:19:34 +00:00

Merge pull request from QuasarApp/updatequasarapplib

update quasarapp lib
This commit is contained in:
Andrei Yankovich 2021-04-20 18:07:08 +03:00 committed by GitHub
commit c80ed18a69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 8 deletions

@ -13,7 +13,7 @@ if(TARGET ${PROJECT_NAME})
endif()
include(Patronum/QuasarAppLib/CMake/ccache.cmake)
include(Patronum/QuasarAppLib/CMake/QuasarApp.cmake)
# Add sub directories
add_subdirectory(Patronum)

@ -9,9 +9,6 @@ cmake_minimum_required(VERSION 3.10)
set(CURRENT_PROJECT ${PROJECT_NAME})
include(QuasarAppLib/CMake/ProjectOut.cmake)
include(QuasarAppLib/CMake/Version.cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

@ -1 +1 @@
Subproject commit b3b83071723212037223ae1e90000578ebb87ed4
Subproject commit 7ea6c9af260c93ba20cabec0489f146bb949f7bf

@ -9,8 +9,6 @@ cmake_minimum_required(VERSION 3.10)
set(CURRENT_PROJECT ${PROJECT_NAME}Test)
include(../Patronum/QuasarAppLib/CMake/ProjectOut.cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
@ -28,6 +26,5 @@ add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt::Test Patronum )
target_include_directories(${CURRENT_PROJECT} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
include(../Patronum/QuasarAppLib/CMake/QuasarAppCITargets.cmake)
initTests()
addTests("Patronum" ${CURRENT_PROJECT})