Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VirtualFluids
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
iRMB
VirtualFluids
Commits
b86951ef
Commit
b86951ef
authored
1 year ago
by
Soeren Peters
Browse files
Options
Downloads
Patches
Plain Diff
Use G++11 for gcovr.
parent
d93aad87
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!237
Adds Ubuntu 22_04 image.
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+5
-4
5 additions, 4 deletions
.gitlab-ci.yml
CMake/compilerflags/GNU.cmake
+4
-4
4 additions, 4 deletions
CMake/compilerflags/GNU.cmake
CMakeLists.txt
+0
-1
0 additions, 1 deletion
CMakeLists.txt
src/basics/config/ConfigurationFile.h
+1
-1
1 addition, 1 deletion
src/basics/config/ConfigurationFile.h
with
10 additions
and
10 deletions
.gitlab-ci.yml
+
5
−
4
View file @
b86951ef
...
...
@@ -509,7 +509,7 @@ lizard:
###############################################################################
# code coverage
gcov_gcc_1
2
:
gcov_gcc_1
1
:
stage
:
analyze
extends
:
.analyze_template
...
...
@@ -518,14 +518,15 @@ gcov_gcc_12:
before_script
:
-
gcovr --version
-
export CC=/usr/bin/gcc-11
-
export CXX=/usr/bin/g++-11
script
:
-
mkdir -p $CI_PROJECT_DIR/build
-
mkdir -p $CI_PROJECT_DIR/build
a
-
cd $CI_PROJECT_DIR/build
-
cmake ..
--preset=make_all
-DCMAKE_CUDA_ARCHITECTURES=60
-DBUILD_VF_COVERAGE=ON
-DCMAKE_BUILD_TYPE=PROFILE
-
make -j4
-
ctest
-
cd ..
...
...
This diff is collapsed.
Click to expand it.
CMake/compilerflags/GNU.cmake
+
4
−
4
View file @
b86951ef
...
...
@@ -17,10 +17,10 @@ if(NOT BUILD_VF_INCLUDE_WHAT_YOU_USE) # optimization flag '-funroll-all-loops' i
endif
()
# gcov
if
(
BUILD_VF_COVERAGE
)
list
(
APPEND CS_COMPILER_FLAGS_CXX
"--coverage"
)
set
(
CMAKE_
EXE_LINKER_FLAGS
${
CMAKE_EXE_LINKER_FLAGS
}
"
--coverage
"
)
endif
(
)
# According to https://gcovr.com/en/stable/cookbook.html#out-of-source-builds-with-cmake
# This flags are used if cmake is called with -DCMAKE_BUILD_TYPE=PROFILE
set
(
CMAKE_
C_FLAGS_PROFILE
--coverage
)
set
(
CMAKE_CXX_FLAGS_PROFILE --coverage
)
#############################################################################################################
# warnings
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
0
−
1
View file @
b86951ef
...
...
@@ -58,7 +58,6 @@ option(BUILD_VF_UNIT_TESTS "Build VirtualFluids unit tests" OFF)
option
(
BUILD_VF_CLANG_TIDY
"Add the clang tidy checks to the targets"
OFF
)
option
(
BUILD_VF_INCLUDE_WHAT_YOU_USE
"Add IWYU to the targets"
OFF
)
option
(
BUILD_VF_CPPCHECK
"Add cppcheck to the targets"
OFF
)
option
(
BUILD_VF_COVERAGE
"Add the -coverage compiler flag."
OFF
)
option
(
BUILD_CUDA_LTO
"Enables the cuda link optimization."
OFF
)
...
...
This diff is collapsed.
Click to expand it.
src/basics/config/ConfigurationFile.h
+
1
−
1
View file @
b86951ef
...
...
@@ -10,7 +10,7 @@
#include
<string>
#include
<fstream>
#include
<iostream>
#include
<stdlib
.h
>
#include
<
c
stdlib>
#include
<basics/utilities/UbException.h>
...
...
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