Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-cpplib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-cpplib
Commits
53c19fdb
Commit
53c19fdb
authored
6 months ago
by
Joscha Schmiedt
Browse files
Options
Downloads
Patches
Plain Diff
Update Makefile
- Add test targets for both Debug and Release
parent
e051ce3e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!61
Release 0.3.0
,
!57
Fix deprecations + updates
Pipeline
#55231
failed
6 months ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+8
-2
8 additions, 2 deletions
.gitlab-ci.yml
Makefile
+27
-5
27 additions, 5 deletions
Makefile
with
35 additions
and
7 deletions
.gitlab-ci.yml
+
8
−
2
View file @
53c19fdb
...
...
@@ -92,11 +92,17 @@ build_vcpkg:
allow_failure
:
true
# unit tests with gtest
test
:
test
-debug
:
tags
:
[
docker
]
stage
:
test
script
:
-
make test
-
make test-debug
test-release
:
tags
:
[
docker
]
stage
:
test
script
:
-
make test-release
trigger_prepare
:
# Calculate the branch name
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
27
−
5
View file @
53c19fdb
...
...
@@ -49,6 +49,16 @@ help:
@
echo
-e
" conan-create - Create Conan binary package in the local conan
\n
"
\
" repostory."
@
echo
" conan - Install dependencies, then build and install package."
@
echo
" doc - Generate documentation."
@
echo
" conan-debug - Install dependencies and create Conan binary package in Debug mode."
@
echo
" conan-build - Build the Conan package."
@
echo
" conan-build-debug - Build the Conan package in Debug mode."
@
echo
" vcpkg-install - Install dependencies with Vcpkg."
@
echo
" vcpkg-build-release - Build the project with Vcpkg in Release mode."
@
echo
" test-debug - Install dependencies, build the project in Debug mode, and run the tests."
@
echo
" test-release - Install dependencies, build the project in Release mode, and run the tests."
@
echo
" clean - Remove build directory."
style
:
$(
CLANG_FORMAT
)
-i
--verbose
\
...
...
@@ -92,14 +102,16 @@ conan-debug: conan-install-debug conan-create-debug
conan-build
:
conan build
.
-s
$(
CONAN_SETTINGS
)
-s
build_type
=
Release
.PHONY
:
conan-build
conan-build-debug
:
conan build
.
-s
$(
CONAN_SETTINGS
)
-s
build_type
=
Debug
.PHONY
:
conan-build-debug
vcpkg-install
:
./vcpkg/bootstrap-vcpkg.sh
-disableMetrics
\
&&
vcpkg/vcpkg
install
.PHONY
:
vcpkg-install
vcpkg-build-release
:
vcpkg-install
mkdir
-p
build/build_tools
\
...
...
@@ -107,12 +119,22 @@ vcpkg-build-release: vcpkg-install
&&
cd
build
\
&&
cmake
-S
..
-B
.
-DCMAKE_TOOLCHAIN_FILE
=
../vcpkg/scripts/buildsystems/vcpkg.cmake
-DVCPKG_TARGET_TRIPLET
=
x64-linux
-DCMAKE_BUILD_TYPE
=
Release
\
&&
cmake
--build
.
.PHONY
:
vcpkg-build-release
ctest
:
ctest
-debug
:
cd
build/Debug
&&
ctest
.PHONY
:
ctest-debug
test
:
conan-install-debug conan-build-debug ctest
ctest-release
:
cd
build/Release
&&
ctest
.PHONY
:
ctest-release
test-debug
:
conan-install-debug conan-build-debug ctest-debug
.PHONY
:
test-debug
test-release
:
conan-install-deps conan-build ctest-release
.PHONY
:
test-release
clean
:
rm
-rf
build
\ No newline at end of file
rm
-rf
build
.PHONY
:
clean
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment