Skip to content

Commit 24b110d

Browse files
committed
Merge branch 'develop' into 'mrdocs-warn-errors'
# Conflicts: # .gitlab-ci-correaa.yml
2 parents 9a1cc2b + ca08697 commit 24b110d

61 files changed

Lines changed: 11205 additions & 1907 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-tidy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Checks: >
1818
-fuchsia-*,
1919
-hicpp-no-array-decay,
2020
-llvm-prefer-static-over-anonymous-namespace,
21+
-llvm-use-ranges,
2122
-llvmlibc-*,
2223
-modernize-use-nodiscard,
2324
-readability-magic-numbers,
@@ -59,6 +60,7 @@ CheckOptions:
5960
# -fuchsia-overloaded-operator: This library deliberately overloads math/comparison operators (==, <, +, &).
6061
# -hicpp-no-array-decay: Required compatibility for Boost Lightweight Test framework.
6162
# -llvm-prefer-static-over-anonymous-namespace: Contradicts alternative internal namespace layout rules.
63+
# -llvm-use-ranges: Asks to use things like llvm::filld1D
6264
# -llvmlibc-*: Suppresses noise; target rules are strictly for internal LLVM implementation developers.
6365
# -modernize-use-nodiscard: Avoids flooding the API surface with noisy [[nodiscard]] attributes everywhere.
6466
# -readability-magic-numbers: Suppressed because test suites heavily utilize magic numbers.

.github/workflows/pages.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ jobs:
3434
3535
- name: Install MrDocs
3636
run: |
37-
wget --no-verbose https://github.com/cppalliance/mrdocs/releases/download/v0.8.0/MrDocs-0.8.0-Linux.tar.gz
38-
tar xzf MrDocs-0.8.0-Linux.tar.gz
37+
wget --no-verbose https://github.com/cppalliance/mrdocs/releases/download/develop-release/MrDocs-develop-Linux.tar.gz # https://github.com/cppalliance/mrdocs/releases/download/v0.8.0/MrDocs-0.8.0-Linux.tar.gz
38+
tar zxf MrDocs-develop-Linux.tar.gz
39+
# wget --no-verbose https://github.com/cppalliance/mrdocs/releases/download/v0.8.0/MrDocs-0.8.0-Linux.tar.gz
40+
# tar xzf MrDocs-0.8.0-Linux.tar.gz
41+
ls -all
3942
echo "$PWD/MrDocs-0.8.0-Linux/bin" >> $GITHUB_PATH
4043
4144
- name: Generate compile_commands.json for MrDocs

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@ cmake-build-debug
4242

4343
# Clion
4444
.idea
45+
46+
multi-documentation.pdf
47+
multi-documentation.html

.gitlab-ci-correaa.yml

Lines changed: 96 additions & 64 deletions
Large diffs are not rendered by default.

.gitlab-ci.yml

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,52 +16,38 @@ variables:
1616
GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task
1717
CMAKE_GENERATOR: "Unix Makefiles"
1818

19-
g++: # debian-stable: default is gcc 14.2.0 as of Dec 2025
19+
g++: # debian-stable: gcc 14.2.0 as of Jun 2026
2020
stage: build
2121
interruptible: false
22-
# tags:
23-
# - non-shared
24-
# - docker
2522
script:
2623
- apt-get -qq update
27-
- apt-get -qq install --no-install-recommends -y --quiet ca-certificates python3 ninja-build cmake gcc g++ git make libboost-timer-dev libboost-serialization-dev libblas-dev liblapack-dev libfftw3-dev pkg-config
28-
- g++ --version
29-
- mkdir build && cd build
30-
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_CXX_FLAGS="-D_GLIBCXX_ASSERTIONS -D_GLIBCXX_DEBUG=1 -D_FORTIFY_SOURCE=3 -ftrivial-auto-var-init=zero -fPIE -pie -Wl,-z,relro,-z,now -fstack-protector-strong -fstack-clash-protection"
31-
- cmake --build . || cmake --build . --verbose
32-
- ctest --parallel 2 || ctest --verbose --rerun-failed --output-on-failure
24+
- apt-get -qq install --no-install-recommends -y --quiet g++ ninja-build make cmake libboost-dev libboost-serialization-dev
25+
# pkg-config libboost-serialization-dev libblas-dev liblapack-dev libfftw3-dev
26+
- cmake . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_CXX_FLAGS="-D_GLIBCXX_ASSERTIONS -D_GLIBCXX_DEBUG=1 -ftrivial-auto-var-init=zero -fPIE -pie -Wl,-z,relro,-z,now -fstack-protector-strong -fstack-clash-protection"
27+
- cmake --build build
28+
- ctest --test-dir build --parallel 2 --output-on-failure
3329

34-
clang++:
30+
clang++: # debian-stable -> clang 19.1.7 as of June 2026
3531
stage: build
36-
# tags:
37-
# - non-shared
38-
# - docker
3932
interruptible: false
4033
script:
4134
- apt-get -qq update
42-
- apt-get -qq install --no-install-recommends -y --quiet ca-certificates clang ninja-build cmake git python3 make libboost-timer-dev libboost-serialization-dev libblas-dev libfftw3-dev liblapack-dev pkg-config
43-
- mkdir build && cd build
44-
- clang++ --version
45-
- CXX=clang++ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-D_GLIBCXX_ASSERTIONS -D_GLIBCXX_DEBUG=1"
46-
- cmake --build . || cmake --build . --parallel 1 --verbose
47-
- ctest --parallel 2 || ctest --verbose --rerun-failed --output-on-failure
35+
- apt-get -qq install --no-install-recommends -y --quiet clang ninja-build make cmake libboost-dev libboost-serialization-dev
36+
# pkg-config libboost-serialization-dev libblas-dev liblapack-dev libfftw3-dev
37+
- CXX=clang++ cmake . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_CXX_FLAGS="-D_GLIBCXX_ASSERTIONS -D_GLIBCXX_DEBUG=1"
38+
- cmake --build build
39+
- ctest --test-dir build --parallel 2 --output-on-failure
4840

49-
clang++-latest libc++ format:
41+
clang++-latest libc++ format: # debian-latest -> 19.1.7 as of June 2026
5042
stage: build
5143
image: debian:latest
52-
# tags:
53-
# - non-shared
54-
# - docker
5544
interruptible: true
5645
script:
5746
- apt-get -qq update
58-
- apt-get -qq install --no-install-recommends -y --quiet ca-certificates git clang clang-format ninja-build cmake make libboost-timer-dev libboost-serialization-dev libblas-dev libc++-dev libc++abi-dev libfftw3-dev liblapack-dev pkg-config tar wget
59-
- mkdir build && cd build
60-
- clang++ --version
61-
- CXX=clang++ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-stdlib=libc++ -DBOOST_NO_CXX98_FUNCTION_BASE -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG"
62-
- cmake --build . || cmake --build . --parallel 1 --verbose
63-
- ctest -j 2 --output-on-failure
64-
- cd ..
47+
- apt-get -qq install --no-install-recommends -y --quiet ca-certificates git clang clang-format ninja-build cmake make libboost-serialization-dev libblas-dev libc++-dev libc++abi-dev libfftw3-dev liblapack-dev pkg-config tar wget
48+
- CXX=clang++ cmake . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_CXX_FLAGS="-stdlib=libc++ -DBOOST_NO_CXX98_FUNCTION_BASE -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG"
49+
- cmake --build build || cmake --build . --parallel 1 --verbose
50+
- ctest --test-dir build --parallel 2 --output-on-failure
6551
- clang-format --version
6652
- clang-format --dry-run -Werror test/*.cpp include/**/*.hpp || echo "errors in formatting"
6753
needs: ["clang++"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ A CMake build system is provided to compile and run basic tests.
9696
ctest -C ./build
9797
```
9898

99-
Once installed, other CMake projects (targets) can depend on Multi by adding a simple `add_subdirectory(my_multi_path)` or by `find_package`:
99+
Once installed, other CMake projects (targets) can depend on Multi by adding `add_subdirectory(my_multi_path)` or by `find_package`:
100100
```cmake
101101
find_package(multi) # see https://gitlab.com/correaa/boost-multi
102102
```

doc/antora.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ asciidoc:
77
stem: latexmath
88
nav:
99
- modules/ROOT/nav.adoc
10-
- modules/reference/nav.adoc
1110
start_page: intro.adoc

0 commit comments

Comments
 (0)