QuasarApp/Heart
4
1
Fork 0
mirror of https://github.com/QuasarApp/Heart.git synced 2025-05-09 16:09:49 +00:00
Code Issues Projects Releases Wiki Activity

update quasaraapp

Browse Source
This commit is contained in:
Andrei Yankovich 2021-04-20 11:57:03 +03:00
parent 3d13f6f6ee
commit e13f71a7c4
4 changed files with 3 additions and 8 deletions

4
CMakeLists.txt

@ -45,7 +45,8 @@ if (HEART_DB_CACHE)
add_definitions(-DHEART_DB_CACHE)
endif()
include(QuasarAppLib/CMake/ccache.cmake)
include(../QuasarAppLib/CMake/QuasarApp.cmake)
include(../QuasarAppLib/CMake/Version.cmake)
# Add sub directories
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Network Sql Concurrent REQUIRED)
@ -58,7 +59,6 @@ if (HEART_TESTS)
add_subdirectory(HeartTests)
endif()
include(QuasarAppLib/CMake/QuasarAppCITargets.cmake)
initAll()
addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)

3
Heart/CMakeLists.txt

@ -7,9 +7,6 @@
cmake_minimum_required(VERSION 3.10)
include(../QuasarAppLib/CMake/ProjectOut.cmake)
include(../QuasarAppLib/CMake/Version.cmake)
if (${HEART_BUILD_LVL} GREATER_EQUAL 2)
add_subdirectory(Qt-Secret)
endif()

2
HeartTests/CMakeLists.txt

@ -9,7 +9,6 @@ cmake_minimum_required(VERSION 3.10)
set(CURRENT_PROJECT ${PROJECT_NAME}Test)
include(../QuasarAppLib/CMake/ProjectOut.cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -62,6 +61,5 @@ target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
include(../QuasarAppLib/CMake/QuasarAppCITargets.cmake)
initTests()
addTests("NetworkProtokol" ${CURRENT_PROJECT})

2
QuasarAppLib

@ -1 +1 @@
Subproject commit b3b83071723212037223ae1e90000578ebb87ed4
Subproject commit aab6cca7f52638b7add7f734b717e7aaaa87c395