Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
8ea2c6b
Init recipe for Sofa (no plugins) on Linux targets only.
olivier-roussel May 4, 2023
51129d7
Add SoftRobot and Cosserat plugins.
olivier-roussel May 4, 2023
c4cc1ed
Add patch for cmake_find_root_path & some plugins.
olivier-roussel May 10, 2023
3a840b3
Add sofa python plugin.
olivier-roussel May 15, 2023
2f3e7e2
Split plugins to separate packages.
olivier-roussel May 17, 2023
986cb28
Fix dependencies.
olivier-roussel May 25, 2023
4236076
Fix cmake option for testing MOR plugin.
olivier-roussel Jun 6, 2023
e38ff87
Add sofa-python3 as dependency for sofa-modelorderreduction (for pyth…
olivier-roussel Jun 6, 2023
d941bef
Add sofa-python3 and sofa-stlib as dependency for sofa-softrobots.
olivier-roussel Jun 6, 2023
db2afbe
Add testings for sofa packages recipes.
olivier-roussel Jun 6, 2023
a45ebe0
Homogenize cmake options.
olivier-roussel Jun 6, 2023
87527fc
Add missing sofa packages recipes tests.
olivier-roussel Jun 6, 2023
03aab3c
Fix linter.
olivier-roussel Jun 6, 2023
81f46bf
Add Python find cmake options for plugins with python bindings.
olivier-roussel Jun 14, 2023
4d5affd
Fix indentation for linter.
olivier-roussel Jun 14, 2023
08c3118
Enable Win and OSX builds.
olivier-roussel Jun 29, 2023
aae034f
Add Win build scripts.
olivier-roussel Jun 29, 2023
38aeea7
Fix recipe for non-linux builds.
olivier-roussel Jul 10, 2023
c1713af
Disable clang-cl for windows build (unsupported by Sofa).
olivier-roussel Jul 10, 2023
68f8ea5
Fix modern C++ for Darwin OSX.
olivier-roussel Jul 10, 2023
9e3eb64
Fix broken install of Sofa when not using the Windows Dependency Pack…
olivier-roussel Jul 17, 2023
bef6073
Update new repository name for Cosserat plugin.
olivier-roussel Jul 18, 2023
f73515d
Clean CMake arguments.
olivier-roussel Jul 18, 2023
7946e52
Fix unnecessary run dependencies due to run-exports.
olivier-roussel Jul 21, 2023
f38f130
Fix invalid installation path for some dll on Windows.
olivier-roussel Jul 24, 2023
6d09b42
Missing UCRT run dependency & fix tests on Windows.
olivier-roussel Jul 24, 2023
57da71d
Extend tests.
olivier-roussel Jul 24, 2023
bac0591
Fix indentation for readability.
olivier-roussel Jul 24, 2023
3b8fdd5
Fix Windows recipe tests.
olivier-roussel Jul 24, 2023
88053b5
Fix Windows broken install due to necessary copy of plugin dlls.
olivier-roussel Jul 27, 2023
4cbb18d
Homogenize sofa-python3 windows build script.
olivier-roussel Jul 29, 2023
bb3e2c2
Enable python 3.8 for sofa-python3.
olivier-roussel Jul 29, 2023
2bc07ec
Update source archive sha256 as release updated.
olivier-roussel Jul 31, 2023
532be01
Remove WinDepPack as it break Windows install.
olivier-roussel Aug 1, 2023
3c81a12
Fixing sofa-python3 overlinking error for python.
olivier-roussel Aug 1, 2023
a3c230d
Homogenize Windows build script.
olivier-roussel Aug 2, 2023
a62def3
Remove clang for Windows as not supported by Sofa yet.
olivier-roussel Aug 2, 2023
59d31c5
Remove beamadapter plugin for now.
olivier-roussel Aug 2, 2023
3d70b7d
Remove modelorderreduction plugin for now.
olivier-roussel Aug 2, 2023
e4a2b73
Remove softrobots plugin for now.
olivier-roussel Aug 2, 2023
99a139e
Remove stlib plugin for now.
olivier-roussel Aug 2, 2023
7a411cb
Remove cosserat plugin for now.
olivier-roussel Aug 2, 2023
071a4ee
Add temp debugging tools.
olivier-roussel Aug 2, 2023
5a2e09d
Add numpy dependency for sofa-python3.
olivier-roussel Aug 2, 2023
16d7a8f
Fix cmake python args for sofa-python3 on Windows.
olivier-roussel Aug 3, 2023
eced7fc
Fix cmake python args for sofa-python3 on Windows.
olivier-roussel Aug 3, 2023
466d99b
Fix cmake python args for sofa-python3.
olivier-roussel Aug 3, 2023
f269f1d
Add hugtalbot to maintainers list.
olivier-roussel Aug 3, 2023
aab1192
Fix cmake python args for sofa-python3.
olivier-roussel Aug 3, 2023
0398f47
Fix cmake python args for sofa-python3.
olivier-roussel Aug 4, 2023
c59a3b1
Add sofa recipe doc for windeppack patch.
olivier-roussel Aug 4, 2023
002ab5a
Add patch to fix invalid python version use in cmake for sofa-python3.
olivier-roussel Aug 4, 2023
638ab69
Fix cmake python args for sofa-python3.
olivier-roussel Aug 4, 2023
bf3d2d8
Trying with to get host path through CONDA_PREFIX var.
olivier-roussel Aug 4, 2023
eff6f88
Force python to be installed on build_env.
olivier-roussel Aug 5, 2023
8c61117
Revert "Force python to be installed on build_env."
olivier-roussel Aug 7, 2023
ad18904
Fix cmake python args.
olivier-roussel Aug 7, 2023
24e257e
Fix linter.
olivier-roussel Aug 7, 2023
1b4fe0b
Revert patch to force python version.
olivier-roussel Aug 7, 2023
a5d6138
Clear debugging output.
olivier-roussel Aug 7, 2023
ca638ab
Homogenize build scripts.
olivier-roussel Aug 7, 2023
ceb0cd9
Add missing lbqglviewer dependency.
olivier-roussel Aug 7, 2023
3365403
Use PREFIX and not CONDA_PREFIX in Unix builds for host env.
olivier-roussel Aug 7, 2023
30ceaac
Use PREFIX and not CONDA_PREFIX in Unix builds for host env.
olivier-roussel Aug 7, 2023
e2537d6
Remove ucrt dependency for Windows.
olivier-roussel Aug 7, 2023
b1b82c3
Fix indent.
olivier-roussel Aug 8, 2023
afb6154
Restore beamadapter package.
olivier-roussel Aug 8, 2023
f8c083d
Restore modelorderreduction package.
olivier-roussel Aug 8, 2023
b1fc402
Restore coesserat package.
olivier-roussel Aug 8, 2023
228b379
Restore softrobot package.
olivier-roussel Aug 8, 2023
9e3ad99
Restore stlib package.
olivier-roussel Aug 8, 2023
ac7f21a
Fix indent.
olivier-roussel Aug 8, 2023
5b5f4ea
Bump to v23.06 release.
olivier-roussel Aug 8, 2023
4014c29
Skip macOS build for now as v23.06 release not available on macOS yet.
olivier-roussel Aug 8, 2023
aa1e5b2
Add missing dependency libqglviewer.
olivier-roussel Aug 8, 2023
4789eaa
Add zlib dependency for SofaPython3 & recipe tests.
olivier-roussel Aug 8, 2023
c4fd8be
Add activation scripts to set SOFA_ROOT env var at SOFA install.
olivier-roussel Aug 8, 2023
b6e1009
Cosms.
olivier-roussel Aug 8, 2023
058b77b
Fix sofa-python3 installation of Python packages on Linux.
olivier-roussel Aug 8, 2023
e240bfc
Fix sofa-python3 recipe tests on Windows.
olivier-roussel Aug 8, 2023
31118ee
Add zlib dependency for sofa-cosserat build.
olivier-roussel Aug 9, 2023
cc44bb7
Add zlib dependency for sofa-modelorderreduction build.
olivier-roussel Aug 9, 2023
db3e54a
Update sofa-softrobots sha256 due to fixed release archive.
olivier-roussel Aug 9, 2023
e9039b6
Add zlib dependency for sofa-softrobots build.
olivier-roussel Aug 10, 2023
783ef82
Fix sofa-cosserat recipe tests for Unix.
olivier-roussel Aug 10, 2023
19abbb8
Add python imports recipe test to sofa-python3.
olivier-roussel Aug 10, 2023
1601c74
Fix sofa-python3 site-package installation path on Windows.
olivier-roussel Aug 10, 2023
e873846
Fix sofa-python3 activations scripts on Windows for SOFA_ROOT and SOF…
olivier-roussel Aug 10, 2023
0f9b486
Add recipe tests for sofa-stlib.
olivier-roussel Aug 10, 2023
e2dfaee
Add sofa-softrobots recipe tests.
olivier-roussel Aug 10, 2023
6bfa7bb
Fix sofa-modelorderreduction python packages.
olivier-roussel Aug 11, 2023
45ff187
Add sofa-modelorderreduction recipe tests.
olivier-roussel Aug 11, 2023
178e25e
Fix sofa-cosserat python packages.
olivier-roussel Aug 11, 2023
a9cb1e7
Fix sofa-modelorderreduction python packages.
olivier-roussel Aug 11, 2023
5a7e554
Sofa-python3 cosms.
olivier-roussel Aug 11, 2023
841ec61
SOFA recipe patch reference PR.
olivier-roussel Aug 11, 2023
69982eb
Add sofa-beamadapter recipe tests.
olivier-roussel Aug 11, 2023
c49a686
Add sofa-softrobots python import test.
olivier-roussel Aug 11, 2023
a7dc2f8
Add sofa-cosserat python import test.
olivier-roussel Aug 11, 2023
53e0f0c
Add mesa-libGL in yum_requirements for sofa-cosserat to pass python t…
olivier-roussel Aug 12, 2023
1884a80
Merge branch 'main' into sofa
olivier-roussel Aug 12, 2023
25c085c
Enable unit tests.
olivier-roussel Aug 12, 2023
06dbea3
Enable internal plugin CollisionOBBCapsule.
olivier-roussel Aug 23, 2023
088c390
Fix sofa-modelorderreduction RPATH to link with sofa internal plugin …
olivier-roussel Aug 24, 2023
9355e2c
Update sha256.
olivier-roussel Aug 23, 2023
4755540
Add missing run dependencies
olivier-roussel Oct 6, 2023
867fe00
Split specific SOFA python env variables.
olivier-roussel Oct 9, 2023
962722a
Add licenses for embedded header-only external projects.
olivier-roussel Nov 2, 2023
5ff9532
split outputs
olivier-roussel Nov 9, 2023
08b6d3d
Merge pull request #1 from olivier-roussel/sofa-split-outputs
olivier-roussel Nov 10, 2023
e1f4f1a
fixing outputs files glob
olivier-roussel Nov 10, 2023
d278837
Use scripts to glob files to avoid rebuild of outputs.
olivier-roussel Jan 4, 2024
4003ae6
Fix multiple output dependencies and add metis
olivier-roussel Feb 1, 2024
8672f8c
move all packages to new package architecture
olivier-roussel Feb 2, 2024
ae3c21d
Fix linter
olivier-roussel Feb 5, 2024
588ceae
add tinyxml externalization patch from 23.12
olivier-roussel Feb 5, 2024
d631240
add metis externalization patch from 23.12
olivier-roussel Feb 5, 2024
1026119
Fix stlib temporary sources
olivier-roussel Feb 6, 2024
e859248
Make SoftRobots as host dependency of Cosserat plugin
olivier-roussel Feb 6, 2024
01a205e
Fix sofa-cosserat dep & disable unit tests
olivier-roussel Feb 7, 2024
2b9bd26
Fix sofa recipe tests on OSX
olivier-roussel Feb 7, 2024
0fd4235
Remove duplicate build of Sofa.GUI.Common
olivier-roussel Feb 8, 2024
082b86e
Delete depreacted patches
olivier-roussel Feb 8, 2024
30d163e
Fix typo in osx recipe tests
olivier-roussel Feb 8, 2024
82919e5
Update sofa-core recipe on windows to v2
olivier-roussel Feb 19, 2024
e7e5e47
Enable sofa build on windows
olivier-roussel Feb 19, 2024
4451843
Add build scripts files for sofa-gl and sofa-gui-qt on windows
olivier-roussel Feb 19, 2024
4f3afcc
remove patch for tinyxml (PR merged)
olivier-roussel Feb 19, 2024
e93d609
Build scripts for sofa core on windows
olivier-roussel Feb 20, 2024
6a9fa8f
Fix sofa core installer on windows
olivier-roussel Feb 20, 2024
f25ba15
Fix sofa-core intall on windows
olivier-roussel Feb 21, 2024
0d81ca8
Ensure only sofa cmake files are installed
olivier-roussel Feb 21, 2024
f3fc42d
Comments
olivier-roussel Feb 21, 2024
89d14c9
Switch sofa-python3 to 23.12 release branch
olivier-roussel Feb 21, 2024
034e9cc
add missing dependencies for sofa-gui-qt on windows
olivier-roussel Feb 21, 2024
ff6c469
build and install scripts cleaning
olivier-roussel Mar 4, 2024
f6fea52
Fix disable TU for softrobots
olivier-roussel Mar 5, 2024
5631f42
re-enable macos build
olivier-roussel Mar 5, 2024
e0f77e6
fix typo
olivier-roussel Mar 5, 2024
9486797
allow metis 5.2.1
olivier-roussel Mar 7, 2024
f9c7b18
Revert "allow metis 5.2.1"
olivier-roussel Mar 7, 2024
be6d454
Merge branch 'conda-forge:main' into sofa
olivier-roussel Mar 8, 2024
451db57
add patch for fix findmetis and try forced version of metis >=5.2.1
olivier-roussel Mar 8, 2024
ffda34b
metis 5.2.1 breaks win build so revert to forced 5.1.0
olivier-roussel Mar 8, 2024
2d4f25f
set licenses per sofa core output
olivier-roussel Mar 8, 2024
464468d
add a global license for the metapackage
olivier-roussel Mar 8, 2024
e6136b0
fix activation scripts install
olivier-roussel Mar 12, 2024
820fff8
add sofa-gui-qt as a dependency of sofa-app
olivier-roussel Mar 12, 2024
75b452c
fix sofa python3 activation script on windows
olivier-roussel Mar 12, 2024
abdc74f
fix typo in windows install scripts
olivier-roussel Mar 13, 2024
35015b6
update patch to avoid linking with libpython on macOS
olivier-roussel Mar 14, 2024
6177aba
remove debug messages
olivier-roussel Mar 21, 2024
27490af
update sha256
olivier-roussel Mar 21, 2024
6d9f92a
update to patched release 23.12
olivier-roussel Mar 21, 2024
0059e3f
bump to sofa patched release 23.12.01
olivier-roussel Mar 27, 2024
3241c63
sofapython3 also build sofa-gui-qt and sofa-gl python bindings
olivier-roussel Mar 27, 2024
0cbb8fd
bump to softrobots new release
olivier-roussel Mar 27, 2024
ea9bd60
bump to v23.12.01
olivier-roussel Apr 3, 2024
a563a6a
fix invalid sofapython3 archive url
olivier-roussel Apr 3, 2024
64e68a2
fix sofa-python3 qglviewer broken patch
olivier-roussel Apr 4, 2024
7b2e867
re-add cosserat patch as PR not backported in 23.12 release
olivier-roussel Apr 4, 2024
a0e5149
Replace sofapython3 multiple-commits patch by single-commit one
olivier-roussel Apr 4, 2024
71c9a25
remove deprecated patches
olivier-roussel Apr 16, 2024
d212f67
fix sofa-gl package dependency to libsofa-core-devel
olivier-roussel Apr 17, 2024
7e9769a
remove deprecated patches
olivier-roussel Apr 18, 2024
a0b6f75
add (redundant) libsofa-core dep to satisfy overlinking
olivier-roussel Apr 18, 2024
ce61e6f
add (redundant) libsofa-core dep to satisfy overlinking to runSoda ou…
olivier-roussel Apr 18, 2024
a364a80
Merge remote-tracking branch 'upstream/main' into sofa
carterbox May 4, 2024
6d687f1
REF: Rename sofa core packages
carterbox May 4, 2024
7653a64
BLD: Fixup intrarecipe depdencies
carterbox May 4, 2024
a85a6c5
REF: Remove redundant run deps for eigen and libboost-devel
carterbox May 4, 2024
d2077ac
REF: Remove depdendency on libboost-devel since links detector report…
carterbox May 4, 2024
e6763b9
BLD: Add stdlib('c') template
carterbox May 4, 2024
817fca6
BUG: Add missing channel pinnings
carterbox May 4, 2024
4fe01a6
BUG: sofa-gl needs boost-headers
carterbox May 4, 2024
525fafd
BUG: Use libboost-headers instead of devel everywhere
carterbox May 4, 2024
ac0864c
Move eigen & cxxopts as runtime deps for libsofa-devel package
olivier-roussel May 29, 2024
a301b9b
Merge branch 'main' into sofa
olivier-roussel Jun 20, 2024
64908eb
bump to v24.06
olivier-roussel Sep 18, 2024
6943878
fix boost dependency
olivier-roussel Sep 24, 2024
34f7b71
Merge branch 'main' into sofa
olivier-roussel Oct 11, 2024
ab67fe7
switch sofa recipes to new format
olivier-roussel Oct 9, 2024
2c06168
enable rattler-build experimental mode (for global cache)
olivier-roussel Oct 11, 2024
68560e7
Merge branch 'conda-forge:main' into sofa
olivier-roussel Oct 19, 2025
d2041e0
Refactor recipes without experimental feature multi-output cache & bu…
olivier-roussel Oct 20, 2025
9ce3d97
Revert "enable rattler-build experimental mode (for global cache)"
olivier-roussel Oct 20, 2025
d01d287
fix lint
olivier-roussel Oct 20, 2025
998fcb6
fix lint
olivier-roussel Oct 20, 2025
3339255
try to fix wrong version jinja interp
olivier-roussel Oct 21, 2025
38bc002
reduce scope of built recipes as global solver fails
olivier-roussel Oct 21, 2025
aefd452
remove all other recipes than sofa
olivier-roussel Oct 21, 2025
93a3279
fix win build scripts
olivier-roussel Oct 21, 2025
40a41e4
apply review remarks
olivier-roussel Nov 12, 2025
37ecaf7
patch to use external nlohmann json
olivier-roussel Nov 12, 2025
126a608
use cmake-package-check tool & fix run dependencies
olivier-roussel Nov 12, 2025
260bf71
add missing zlib run dep for sofa-devel
olivier-roussel Nov 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions recipes/sofa/activate.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
set SOFA_ROOT=%CONDA_PREFIX%\Library
1 change: 1 addition & 0 deletions recipes/sofa/activate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export SOFA_ROOT=$CONDA_PREFIX
1 change: 1 addition & 0 deletions recipes/sofa/deactivate.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@set SOFA_ROOT=
1 change: 1 addition & 0 deletions recipes/sofa/deactivate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
unset SOFA_ROOT
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 3139b27ebae8e1c1909340fd598de5dd8ba0bd28 Mon Sep 17 00:00:00 2001
From: Frederick Roy <fredroy@users.noreply.github.com>
Date: Tue, 26 Aug 2025 16:57:14 +0900
Subject: [PATCH] [GUI] Fix compilation with clang and boost 1.89 (#5664)

fix compilation with clang and boost 1.89
---
Sofa/GUI/Batch/src/sofa/gui/batch/BatchGUI.h | 1 +
Sofa/GUI/Common/src/sofa/gui/common/GUIManager.h | 1 +
2 files changed, 2 insertions(+)

diff --git a/Sofa/GUI/Batch/src/sofa/gui/batch/BatchGUI.h b/Sofa/GUI/Batch/src/sofa/gui/batch/BatchGUI.h
index 91cb614b77..34f61c8a8d 100644
--- a/Sofa/GUI/Batch/src/sofa/gui/batch/BatchGUI.h
+++ b/Sofa/GUI/Batch/src/sofa/gui/batch/BatchGUI.h
@@ -23,6 +23,7 @@

#include <sofa/gui/batch/config.h>
#include <sofa/gui/common/BaseGUI.h>
+#include <sofa/simulation/Node.h>
#include <sofa/simulation/fwd.h>
#include <string>
#include <sstream>
diff --git a/Sofa/GUI/Common/src/sofa/gui/common/GUIManager.h b/Sofa/GUI/Common/src/sofa/gui/common/GUIManager.h
index c6fcb634d9..1578cc2728 100644
--- a/Sofa/GUI/Common/src/sofa/gui/common/GUIManager.h
+++ b/Sofa/GUI/Common/src/sofa/gui/common/GUIManager.h
@@ -22,6 +22,7 @@
#pragma once
#include <sofa/gui/common/config.h>

+#include <sofa/simulation/Node.h>
#include <sofa/simulation/fwd.h>

#include <vector>
--
2.34.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
From d67d1cda5f44d322059d0a2115c77038e5e88a5c Mon Sep 17 00:00:00 2001
From: Frederick Roy <fredroy@users.noreply.github.com>
Date: Tue, 26 Aug 2025 16:57:56 +0900
Subject: [PATCH] [Framework] Fix compilation with clang20 (#5665)

* fix compilation with clang20

* remove deprecation warning about space with operator string litteral

---------

Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
---
Sofa/framework/Config/src/sofa/config.h.in | 4 ++--
Sofa/framework/Type/src/sofa/type/Mat.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Sofa/framework/Config/src/sofa/config.h.in b/Sofa/framework/Config/src/sofa/config.h.in
index a5e01a9ac1..2b2828c5fd 100644
--- a/Sofa/framework/Config/src/sofa/config.h.in
+++ b/Sofa/framework/Config/src/sofa/config.h.in
@@ -53,12 +53,12 @@ typedef double SReal;
#endif

/// User-defined literals allowing to convert any floating-point to a SReal
-constexpr SReal operator"" _sreal(long double real)
+constexpr SReal operator""_sreal(long double real)
{
return static_cast<SReal>(real);
}
/// User-defined literals allowing to convert any integer to a SReal
-constexpr SReal operator"" _sreal(unsigned long long int integer)
+constexpr SReal operator""_sreal(unsigned long long int integer)
{
return static_cast<SReal>(integer);
}
diff --git a/Sofa/framework/Type/src/sofa/type/Mat.h b/Sofa/framework/Type/src/sofa/type/Mat.h
index e193389fdb..529cd97f09 100644
--- a/Sofa/framework/Type/src/sofa/type/Mat.h
+++ b/Sofa/framework/Type/src/sofa/type/Mat.h
@@ -28,6 +28,7 @@
#include <sofa/type/Vec.h>

#include <iostream>
+#include <algorithm>

namespace // anonymous
{
--
2.34.1

Loading