Skip to content

Commit 0f326e7

Browse files
authored
Revert "Refactor CMake with JRL CMake Modules v2"
1 parent 26845b1 commit 0f326e7

Some content is hidden

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

47 files changed

+2328
-2508
lines changed

.gersemirc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
definitions: [./CMakeLists.txt, ./tests]
2-
line_length: 100
1+
definitions: [./CMakeLists.txt, ./cmake, ./tests]
2+
line_length: 80
33
indent: 2
44
warn_about_unknown_commands: false

.github/workflows/macos-linux-windows-pixi.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ jobs:
5555

5656
steps:
5757
- uses: actions/checkout@v6
58+
with:
59+
submodules: recursive
5860

5961
- uses: actions/cache@v4
6062
with:
@@ -71,23 +73,19 @@ jobs:
7173
run: |
7274
pixi run -e ${{ matrix.environment }} ccache -z
7375
74-
- name: Configure nanoeigenpy [MacOS/Linux/Windows]
76+
- name: Build nanoeigenpy [MacOS/Linux/Windows]
7577
env:
7678
NANOEIGENPY_BUILD_TYPE: ${{ matrix.build_type }}
77-
run: |
78-
pixi run -e ${{ matrix.environment }} configure
79-
80-
- name: Build nanoeigenpy [MacOS/Linux/Windows]
8179
run: |
8280
pixi run -e ${{ matrix.environment }} build
8381
8482
- name: Test nanoeigenpy [MacOS/Linux/Windows]
8583
run: |
86-
pixi run -e ${{ matrix.environment }} test
84+
pixi run -e ${{ matrix.environment }} ctest --test-dir build --output-on-failure
8785
8886
- name: Install nanoeigenpy [MacOS/Linux/Windows]
8987
run: |
90-
pixi run -e ${{ matrix.environment }} install
88+
pixi run -e ${{ matrix.environment }} cmake --build build --target install
9189
9290
- name: Show ccache statistics [MacOS/Linux/Windows]
9391
run: |
@@ -104,12 +102,14 @@ jobs:
104102

105103
steps:
106104
- uses: actions/checkout@v6
105+
with:
106+
submodules: recursive
107107

108108
- uses: prefix-dev/[email protected]
109109
env:
110110
CMAKE_BUILD_PARALLEL_LEVEL: 2
111111
with:
112-
cache: false # ⚠️ Disabling cache for testing ⚠️
112+
cache: true
113113
environments: test-pixi-build
114114

115115
- name: Test package [MacOS/Linux/Windows]

.github/workflows/ros_ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ jobs:
3131
env:
3232
# PRERELEASE: true # Fails due to issues in the underlying Docker image
3333
BUILDER: colcon
34-
VERBOSE_OUTPUT: true
35-
VERBOSE_TESTS: true
36-
DEBUG_BASH: true
3734
runs-on: ubuntu-latest
3835
steps:
3936
- uses: actions/checkout@v6
37+
with:
38+
submodules: recursive
4039
# Run industrial_ci
4140
- uses: 'ros-industrial/industrial_ci@ba2a3d0f830f8051b356711a8df2fedfc5d256cf'
4241
env: ${{ matrix.env }}

.gitignore

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
build*/
2-
install*/
3-
.pytest_cache/
42
.cache/
5-
.pixi/
6-
__pycache__/
7-
Xcode*
8-
*.pyc
9-
*~
3+
__pycache__
4+
.pytest_cache
5+
6+
# pixi environments
7+
.pixi
108
*.egg-info
11-
.ruff_cache
12-
.DS_Store
13-
compile_commands.json
14-
cmake-profiling.json
15-
result
16-
*.conda

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "cmake"]
2+
path = cmake
3+
url = https://github.com/jrl-umi3218/jrl-cmakemodules.git
4+
[submodule "ext/nanobind"]
5+
path = ext/nanobind
6+
url = https://github.com/wjakob/nanobind

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1414
- Python version update ([#25](https://github.com/Simple-Robotics/nanoeigenpy/pull/25)):
1515
- Project is now tested with Python 3.10 and 3.14
1616
- Python 3.10 is the minimal supported Python version
17-
- Switch to [JRL CMake modules v2](https://github.com/jrl-umi3218/jrl-cmakemodules/pull/798) ([#28](https://github.com/Simple-Robotics/nanoeigenpy/pull/28))
1817

1918
### Added
2019
- Add pixi-build support ([#25](https://github.com/Simple-Robotics/nanoeigenpy/pull/25))

0 commit comments

Comments
 (0)