added Heart submodule

This commit is contained in:
Andrei Yankovich 2021-03-20 11:55:40 +03:00
parent 7d51469a2a
commit c5ece1e765
8 changed files with 10 additions and 48 deletions

9
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "CMake"]
path = CMake
url = https://github.com/QuasarApp/CMake.git
[submodule "DoxyStyle"]
path = DoxyStyle
url = https://github.com/QuasarApp/DoxyStyle.git
[submodule "Heart"]
path = Heart
url = https://github.com/QuasarApp/Heart

1
CMake

@ -1 +0,0 @@
Subproject commit 30b2e07c474ab032dd120475b0a2a4cca6012fe7

View File

@ -18,8 +18,8 @@ set (BUILD_SHARED_LIBS ON)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Test QUIET)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET)
include(CMake/ccache.cmake)
include(CMake/QuasarAppCITargets.cmake)
include(Heart/QuasarAppLib/CMake/ccache.cmake)
include(Heart/QuasarAppLib/CMake/QuasarAppCITargets.cmake)
# Add sub directories
add_subdirectory(src)

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

1
Heart Submodule

@ -0,0 +1 @@
Subproject commit 41bde39444410571b8c1e3fd84a4380e73703d64

33
init.sh
View File

@ -1,33 +0,0 @@
#!/bin/sh
echo "Project name: $1"
if [ $# -ne 1 ]
then
echo "You call this script wtth wrong arguments."
echo "Example for start script:"
echo "./init.sh MyCmakeProject"
exit 1
fi
REPLACESTRING="s+CQtDeployerServer+$1+g"
echo $REPLACESTRING
find . -not -path '*/\.*' -type f -exec sed -i $REPLACESTRING {} +
find . -not -path '*/\.*' -type f -exec sed -i $REPLACESTRING {} +
find src -type d -name '*CQtDeployerServer*' -exec sh -c 'x="{}"; NEWSTR=$(echo "$x" | sed "s/CQtDeployerServer/'$1'/"); mv "$x" "$NEWSTR"' \;
find src -type f -name '*CQtDeployerServer*' -exec sh -c 'x="{}"; NEWSTR=$(echo "$x" | sed "s/CQtDeployerServer/'$1'/"); mv "$x" "$NEWSTR"' \;
set -e
git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
while read path_key path
do
url_key=$(echo $path_key | sed 's/\.path/.url/')
url=$(git config -f .gitmodules --get "$url_key")
git submodule add $url $path
done

View File

@ -17,9 +17,9 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
include(../CMake/ProjectOut.cmake)
include(../CMake/Version.cmake)
include(../CMake/tr.cmake)
include(../Heart/QuasarAppLib/CMake/ProjectOut.cmake)
include(../Heart/QuasarAppLib/CMake/Version.cmake)
include(../Heart/QuasarAppLib/CMake/tr.cmake)
add_subdirectory(Library)
add_subdirectory(Server)

View File

@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.14)
set(CURRENT_PROJECT ${PROJECT_NAME}Test)
include(../CMake/ProjectOut.cmake)
include(../Heart/QuasarAppLib/CMake/ProjectOut.cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
@ -34,6 +34,5 @@ target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt::Test CQtDeployerServer)
target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
include(../CMake/QuasarAppCITargets.cmake)
initTests()
addTests(${PROJECT_NAME} ${CURRENT_PROJECT})