Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrade CGAL to 5.6 #291

Merged
merged 1 commit into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 0 additions & 23 deletions configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -130,26 +130,3 @@ EOF
# Backport of https://develop.openfoam.com/Development/openfoam/-/issues/3098
[ $(bin/foamEtcFile -show-api) -gt 2312 ] || sed -i '' 's|_foamAddLib "$FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN"|_foamAddLib "$FOAM_SITE_LIBBIN"\n_foamAddLib "$FOAM_USER_LIBBIN"|' etc/config.sh/setup
[ $(bin/foamEtcFile -show-api) -gt 2312 ] || sed -i '' 's|_foamAddLib "$FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN"|_foamAddLib "$FOAM_SITE_LIBBIN"\n_foamAddLib "$FOAM_USER_LIBBIN"|' etc/config.csh/setup


# Compatibility with CGAL 6 (https://develop.openfoam.com/Development/openfoam/-/issues/3234)
sed -i '' 's|c++14|c++17|' wmake/rules/General/Clang/c++
patch src/OpenFOAM/db/IOstreams/memory/ISpanStream.H <<EOF
@@ -119,10 +119,10 @@ public:
#if __cplusplus >= 201703L
//- Construct (shallow copy) from std::string_view content
explicit ispanstream(std::string_view s)
- {
+ :
buffer_type(const_cast<char*>(s.data()), s.size()),
- stream_type(static_cast<buffer_type*>(this));
- }
+ stream_type(static_cast<buffer_type*>(this))
+ {}
#endif

//- Construct (shallow copy) from span character content
EOF
sed -i '' 's|boost::optional|std::optional|' applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
sed -i '' 's|boost::optional|std::optional|' applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
sed -i '' 's|boost::get|std::get_if|' applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
38 changes: 20 additions & 18 deletions pixi.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ llvm-openmp = ">=19.1.1,<20"
openmpi = ">=5.0.5,<6"
fftw = ">=3.3.10,<4"
scotch = ">=7.0.5,<8"
cgal-cpp = ">=6.0,<7"
cgal-cpp = ">=5.6.1,<6"
bash = ">=5.2.21,<6"

[environments]
Expand Down
Loading