Compare commits
46 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8c7372ea35 | ||
|
|
bbe788dd60 | ||
|
|
138bd36c80 | ||
|
|
9abc50053e | ||
|
|
33029bd74a | ||
|
|
10609fd0b4 | ||
|
|
06975b6874 | ||
|
|
b549eab6ca | ||
|
|
1bad20daa2 | ||
|
|
0a83798dcd | ||
|
|
712c6a119f | ||
|
|
d03d5b627a | ||
|
|
977b97afd7 | ||
|
|
513886e30f | ||
|
|
6ce2ee12ad | ||
|
|
c97049148e | ||
|
|
f5aa030bef | ||
|
|
aaaca2c0b1 | ||
|
|
c837ea7557 | ||
|
|
bcef76041a | ||
|
|
a0652c93e2 | ||
|
|
164fe029d0 | ||
|
|
27b529371b | ||
|
|
910b41b994 | ||
|
|
47ae6f39cf | ||
|
|
41bc6039e5 | ||
|
|
f9c59e95f8 | ||
|
|
a6a3e85f3d | ||
|
|
67b28c99b3 | ||
|
|
b3ca0c362e | ||
|
|
a0e6eb3423 | ||
|
|
b40eb58ce9 | ||
|
|
c4619488f2 | ||
|
|
86f72a7d64 | ||
|
|
124e6660e8 | ||
|
|
7fb308658e | ||
|
|
8c2b851ce9 | ||
|
|
b6d7ec695a | ||
|
|
a2396aece5 | ||
|
|
0b64c4100d | ||
|
|
ca104a2d3b | ||
|
|
31dc8e0993 | ||
|
|
87defd074f | ||
|
|
a63b3c42de | ||
|
|
abc989a3a7 | ||
|
|
8d718f4ee4 |
11 changed files with 227 additions and 99 deletions
11
.gitignore
vendored
11
.gitignore
vendored
|
|
@ -67,3 +67,14 @@
|
|||
/gmsh-4.10.3-source-fedora.tar.xz
|
||||
/gmsh-4.10.4-source-fedora.tar.xz
|
||||
/gmsh-4.10.5-source-fedora.tar.xz
|
||||
/gmsh-4.11.0-source-fedora.tar.xz
|
||||
/gmsh-4.11.1-source-fedora.tar.xz
|
||||
/gmsh-4.12.0-source-fedora.tar.xz
|
||||
/gmsh-4.12.1-source-fedora.tar.xz
|
||||
/gmsh-4.12.2-source-fedora.tar.xz
|
||||
/gmsh-4.13.0-source-fedora.tar.xz
|
||||
/gmsh-4.13.1-source-fedora.tar.xz
|
||||
/gmsh-4.13.2-source-fedora.tar.xz
|
||||
/gmsh-4.14.0-source-fedora.tar.xz
|
||||
/gmsh-4.14.1-source-fedora.tar.xz
|
||||
/gmsh-4.15.0-source-fedora.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
#!/bin/sh
|
||||
|
||||
#if [ $# -lt 1 ]; then
|
||||
# echo "Usage: $0 upstream_ver"
|
||||
# exit 1
|
||||
#fi
|
||||
|
||||
ver=`grep Version: gmsh.spec | awk -F " " '{print $2}'`
|
||||
|
||||
echo "This will download and rearchive gmsh version $ver"
|
||||
|
|
|
|||
176
gmsh.spec
176
gmsh.spec
|
|
@ -1,7 +1,15 @@
|
|||
%if 0%{?fedora} >= 40
|
||||
%ifarch %{ix86}
|
||||
%bcond_with openmpi
|
||||
%else
|
||||
%bcond_without openmpi
|
||||
%endif
|
||||
%else
|
||||
%bcond_without openmpi
|
||||
%endif
|
||||
%bcond_without mpich
|
||||
|
||||
%global sover 4.10
|
||||
%global sover 4.15
|
||||
|
||||
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
|
||||
%bcond_without flexiblas
|
||||
|
|
@ -9,12 +17,14 @@
|
|||
|
||||
Name: gmsh
|
||||
Summary: A three-dimensional finite element mesh generator
|
||||
Version: 4.10.5
|
||||
Release: 2%{?dist}
|
||||
Version: 4.15.0
|
||||
Release: 1%{?dist}
|
||||
# MPI not available on i686
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
# gmsh is GPLv2+ with exceptions, see LICENSE.txt
|
||||
# gmsh is GPL-2.0-or-later WITH Gmsh-exception, see LICENSE.txt
|
||||
# contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt
|
||||
License: GPLv2+ with exceptions and MIT
|
||||
License: GPL-2.0-or-later WITH Gmsh-exception AND MIT
|
||||
URL: http://geuz.org/gmsh/
|
||||
# Download source from http://geuz.org/gmsh/src/%%{name}-%%{version}-source.tgz
|
||||
# Delete contrib/blossom and contrib/mpeg_encode from source archive
|
||||
|
|
@ -29,19 +39,17 @@ Patch1: gmsh_med.patch
|
|||
Patch2: gmsh_julia.patch
|
||||
# Remove odd install of gmsh shared library
|
||||
Patch3: gmsh_install.patch
|
||||
# Fix build error caused by include ordering
|
||||
Patch4: gmsh_build.patch
|
||||
# Unbundle gl2ps
|
||||
Patch5: gmsh_unbundle_gl2ps.patch
|
||||
Patch4: gmsh_unbundle_gl2ps.patch
|
||||
# Make gmm use superlu
|
||||
Patch5: gmsh_gmm.patch
|
||||
|
||||
BuildRequires: alglib-devel
|
||||
BuildRequires: ann-devel
|
||||
%if %{with flexiblas}
|
||||
BuildRequires: flexiblas-devel
|
||||
%else
|
||||
BuildRequires: blas-devel, lapack-devel
|
||||
%endif
|
||||
BuildRequires: eigen3-devel
|
||||
BuildRequires: cgnslib-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: desktop-file-utils
|
||||
|
|
@ -54,7 +62,6 @@ BuildRequires: hdf5-devel
|
|||
BuildRequires: libjpeg-turbo-devel
|
||||
BuildRequires: liblbfgs-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: mathex-devel
|
||||
BuildRequires: med-devel
|
||||
BuildRequires: mesa-libGLU-devel
|
||||
|
|
@ -63,6 +70,7 @@ BuildRequires: netgen-mesher-devel-private
|
|||
BuildRequires: opencascade-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: SuperLU-devel
|
||||
BuildRequires: voro++-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: texinfo
|
||||
|
|
@ -107,6 +115,10 @@ Summary: Python3 API for %{name}
|
|||
%{?python_provide:%python_provide python3-%{name}}
|
||||
Obsoletes: python3-%{name}-private
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{name}
|
||||
Python3 API for %{name}.
|
||||
|
||||
|
|
@ -208,10 +220,12 @@ cp contrib/Netgen/nglib_gmsh.h contrib/Netgen/nglib_gmsh.cpp src/mesh
|
|||
# hxt: see contrib/hxt/CREDITS.txt
|
||||
# kbipack: Source not available on the net anymore
|
||||
# onelab: gmsh internal module
|
||||
# WinslowUntangler: gmsh internal module (?)
|
||||
(
|
||||
cd contrib;
|
||||
ls -1 | \
|
||||
grep -v ^bamg$ | \
|
||||
grep -v ^blossom$ | \
|
||||
grep -v ^DiscreteIntegration$ | \
|
||||
grep -v ^MeshOptimizer$ | \
|
||||
grep -v ^HighOrderMeshOptimizer$ | \
|
||||
|
|
@ -219,6 +233,8 @@ ls -1 | \
|
|||
grep -v ^hxt$ | \
|
||||
grep -v ^kbipack$ | \
|
||||
grep -v ^onelab$ | \
|
||||
grep -v ^tinyobjloader$ | \
|
||||
grep -v ^WinslowUntangler$ | \
|
||||
xargs rm -rf
|
||||
)
|
||||
|
||||
|
|
@ -233,18 +249,11 @@ gmsh_cmake_args="\
|
|||
-DENABLE_BUILD_LIB=YES \
|
||||
-DENABLE_BUILD_SHARED=YES \
|
||||
-DENABLE_BUILD_DYNAMIC=YES \
|
||||
-DENABLE_MPEG_ENCODE=NO \
|
||||
-DENABLE_METIS=YES \
|
||||
-DENABLE_BLOSSOM=NO \
|
||||
-DENABLE_CGNS=YES \
|
||||
-DENABLE_MED=YES \
|
||||
-DENABLE_EIGEN=YES \
|
||||
-DEIGEN_INC=%{_includedir}/eigen3 \
|
||||
-DENABLE_OCC=YES"
|
||||
-DENABLE_MPEG_ENCODE=NO"
|
||||
|
||||
### serial version ###
|
||||
%define _vpath_builddir %{_target_platform}
|
||||
%cmake .. \
|
||||
%cmake \
|
||||
-DENABLE_OPENMP=ON \
|
||||
$gmsh_cmake_args
|
||||
|
||||
|
|
@ -255,7 +264,7 @@ gmsh_cmake_args="\
|
|||
%{_openmpi_load}
|
||||
export CXX=mpicxx
|
||||
%define _vpath_builddir %{_target_platform}-openmpi
|
||||
%cmake .. \
|
||||
%cmake \
|
||||
-DENABLE_MPI=YES \
|
||||
-DCMAKE_INSTALL_BINDIR=$MPI_BIN \
|
||||
-DCMAKE_INSTALL_LIBDIR=$MPI_LIB \
|
||||
|
|
@ -271,7 +280,7 @@ export CXX=mpicxx
|
|||
%{_mpich_load}
|
||||
export CXX=mpicxx
|
||||
%define _vpath_builddir %{_target_platform}-mpich
|
||||
%cmake .. \
|
||||
%cmake \
|
||||
-DENABLE_MPI=YES \
|
||||
-DCMAKE_INSTALL_BINDIR=$MPI_BIN \
|
||||
-DCMAKE_INSTALL_LIBDIR=$MPI_LIB \
|
||||
|
|
@ -283,7 +292,7 @@ export CXX=mpicxx
|
|||
%endif
|
||||
|
||||
# Built html documentation
|
||||
make -C %{_target_platform} html
|
||||
%cmake_build --target html
|
||||
|
||||
# Fix to create correct debuginfo
|
||||
cp -a src/parser/Gmsh.* %{_target_platform}
|
||||
|
|
@ -311,7 +320,7 @@ cp -a src/parser/Gmsh.* %{_target_platform}-mpich
|
|||
find %{buildroot} -type f -name libgmsh.a -exec rm -f {} \;
|
||||
|
||||
# Install icon and .desktop file
|
||||
convert -scale 128 utils/icons/gmsh.png icon_128x128.png
|
||||
magick utils/icons/gmsh.png -scale 128 icon_128x128.png
|
||||
install -Dpm 0644 icon_128x128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
|
||||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
|
||||
|
||||
|
|
@ -336,6 +345,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
|
|||
%doc %{_defaultdocdir}/%{name}/tutorials
|
||||
%doc %{_defaultdocdir}/%{name}/examples
|
||||
%doc %{_defaultdocdir}/%{name}/%{name}.html
|
||||
%doc %{_defaultdocdir}/%{name}/images/
|
||||
|
||||
%files
|
||||
%{_bindir}/%{name}
|
||||
|
|
@ -343,8 +353,8 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
|
|||
%files devel
|
||||
%{_includedir}/gmsh.h
|
||||
%{_includedir}/gmshc.h
|
||||
%{_includedir}/gmshf.h
|
||||
%{_includedir}/gmsh.h_cwrap
|
||||
%{_includedir}/gmsh.f90
|
||||
%{_libdir}/libgmsh.so
|
||||
|
||||
%files libs
|
||||
|
|
@ -354,6 +364,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
|
|||
%files -n python3-%{name}
|
||||
%{python3_sitelib}/gmsh.py
|
||||
%{python3_sitelib}/__pycache__/gmsh.*.pyc
|
||||
%{python3_sitelib}/gmsh-%{version}*.dist-info/
|
||||
|
||||
%if %{with openmpi}
|
||||
%files openmpi
|
||||
|
|
@ -362,8 +373,8 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
|
|||
%files openmpi-devel
|
||||
%{_includedir}/openmpi*/gmsh.h
|
||||
%{_includedir}/openmpi*/gmshc.h
|
||||
%{_includedir}/openmpi*/gmshf.h
|
||||
%{_includedir}/openmpi*/gmsh.h_cwrap
|
||||
%{_includedir}/openmpi*/gmsh.f90
|
||||
%{_libdir}/openmpi/lib/libgmsh.so
|
||||
|
||||
%files openmpi-libs
|
||||
|
|
@ -378,8 +389,8 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
|
|||
%files mpich-devel
|
||||
%{_includedir}/mpich*/gmsh.h
|
||||
%{_includedir}/mpich*/gmshc.h
|
||||
%{_includedir}/mpich*/gmshf.h
|
||||
%{_includedir}/mpich*/gmsh.h_cwrap
|
||||
%{_includedir}/mpich*/gmsh.f90
|
||||
%{_libdir}/mpich/lib/libgmsh.so
|
||||
|
||||
%files mpich-libs
|
||||
|
|
@ -389,9 +400,118 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 17 2023 Richard Shaw <hobbes1069@gmail.com> - 4.10.5-2
|
||||
* Sun Oct 26 2025 Sandro Mani <manisandro@gmail.com> - 4.15.0-1
|
||||
- Update to 4.15.0
|
||||
|
||||
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 4.14.1-2
|
||||
- Rebuilt for Python 3.14.0rc3 bytecode
|
||||
|
||||
* Tue Sep 02 2025 Sandro Mani <manisandro@gmail.com> - 4.14.1-1
|
||||
- Update to 4.14.1
|
||||
|
||||
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 4.14.0-4
|
||||
- Rebuilt for Python 3.14.0rc2 bytecode
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jul 17 2025 Sandro Mani <manisandro@gmail.com> - 4.14.0-2
|
||||
- Use %%cmake_build instead of make
|
||||
|
||||
* Fri Jul 04 2025 Sandro Mani <manisandro@gmail.com> - 4.14.0-1
|
||||
- Update to 4.14.0
|
||||
|
||||
* Wed Jun 04 2025 Python Maint <python-maint@redhat.com> - 4.13.2-12
|
||||
- Rebuilt for Python 3.14
|
||||
|
||||
* Thu May 29 2025 Richard Shaw <hobbes1069@gmail.com> - 4.13.2-11
|
||||
- Rebuild for opencascade 7.9.1.
|
||||
|
||||
* Wed May 28 2025 Richard Shaw <hobbes1069@gmail.com> - 4.13.2-10
|
||||
- Rebuild for opencascade 7.9.1.
|
||||
|
||||
* Sat May 24 2025 Sandro Mani <manisandro@gmail.com> - 4.13.2-9
|
||||
- Add fix for GCC15 build failure
|
||||
|
||||
* Mon Feb 3 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.13.2-8
|
||||
- Rebuild for tcl/tk
|
||||
|
||||
* Tue Jan 28 2025 Sandro Mani <manisandro@gmail.com> - 4.13.2-7
|
||||
- Rebuild (cgnslib)
|
||||
|
||||
* Fri Jan 24 2025 Sandro Mani <manisandro@gmail.com> - 4.13.2-6
|
||||
- Rebuild (cgnslib)
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Oct 25 2024 Orion Poplawski <orion@nwra.com> - 4.13.2-4
|
||||
- Rebuild for hdf5 1.14.5
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 4.13.2-2
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Tue Jun 04 2024 Sandro Mani <manisandro@gmail.com> - 4.13.2-1
|
||||
- Update to 4.13.2
|
||||
|
||||
* Sun Jun 02 2024 Richard Shaw <hobbes1069@gmail.com> - 4.13.1-2
|
||||
- Rebuild for opencascade 7.8.1.
|
||||
|
||||
* Wed May 08 2024 Sandro Mani <manisandro@gmail.com> - 4.13.1-1
|
||||
- Update to 4.13.1
|
||||
|
||||
* Tue Apr 09 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 4.13.0-3
|
||||
- Ensure python3-gmsh depends on gmsh-libs
|
||||
- Make the python3-gmsh subpackage noarch, since the bindings are pure Python
|
||||
|
||||
* Fri Mar 29 2024 Richard Shaw <hobbes1069@gmail.com> - 4.13.0-2
|
||||
- Rebuild for OpenCascade 7.8.0.
|
||||
|
||||
* Tue Feb 27 2024 Sandro Mani <manisandro@gmail.com> - 4.13.0-1
|
||||
- Update to 4.13.0
|
||||
|
||||
* Tue Jan 23 2024 Sandro Mani <manisandro@gmail.com> - 4.12.2-1
|
||||
- Update to 4.12.2
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 14 2024 Sandro Mani <manisandro@gmail.com> - 4.12.1-1
|
||||
- Update to 4.12.1
|
||||
|
||||
* Mon Jan 01 2024 Sandro Mani <manisandro@gmail.com> - 4.12.0-1
|
||||
- Update to 4.12.0
|
||||
|
||||
* Sun Oct 29 2023 Orion Poplawski <orion@nwra.com> - 4.11.1-7
|
||||
- Rebuild for openmpi 5.0.0, drops i686 and C++ API
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jul 06 2023 Sandro Mani <manisandro@gmail.com> - 4.11.1-5
|
||||
- Rebuild (cgnslib)
|
||||
|
||||
* Sat Jun 17 2023 Python Maint <python-maint@redhat.com> - 4.11.1-4
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jan 14 2023 Richard Shaw <hobbes1069@gmail.com> - 4.11.1-2
|
||||
- Rebuild for opencascade.
|
||||
|
||||
* Wed Dec 21 2022 Sandro Mani <manisandro@gmail.com> - 4.11.1-1
|
||||
- Update to 4.11.1
|
||||
|
||||
* Tue Nov 08 2022 Sandro Mani <manisandro@gmail.com> - 4.11.0-1
|
||||
- Update to 4.11.0
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sun Jul 03 2022 Sandro Mani <manisandro@gmail.com> - 4.10.5-1
|
||||
- Update to 4.10.5
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
diff -rupN --no-dereference gmsh-4.10.5-source/src/fltk/helpWindow.cpp gmsh-4.10.5-source-new/src/fltk/helpWindow.cpp
|
||||
--- gmsh-4.10.5-source/src/fltk/helpWindow.cpp 2022-07-03 18:30:12.102025772 +0200
|
||||
+++ gmsh-4.10.5-source-new/src/fltk/helpWindow.cpp 2022-07-03 18:30:12.546025782 +0200
|
||||
@@ -3,6 +3,12 @@
|
||||
// See the LICENSE.txt file in the Gmsh root directory for license information.
|
||||
// Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
|
||||
|
||||
+#include "GmshConfig.h"
|
||||
+
|
||||
+#if defined(HAVE_MED)
|
||||
+#include <med/med.h>
|
||||
+#endif
|
||||
+
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
@@ -11,7 +17,6 @@
|
||||
#include <FL/Fl_Check_Button.H>
|
||||
#include <FL/Fl_Input.H>
|
||||
#include <FL/Fl_Color_Chooser.H>
|
||||
-#include "GmshConfig.h"
|
||||
#include "FlGui.h"
|
||||
#include "inputValue.h"
|
||||
#include "helpWindow.h"
|
||||
22
gmsh_gmm.patch
Normal file
22
gmsh_gmm.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff -rupN gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source-new/CMakeLists.txt
|
||||
--- gmsh-4.15.0-source/CMakeLists.txt 2025-11-16 12:12:00.997452631 +0100
|
||||
+++ gmsh-4.15.0-source-new/CMakeLists.txt 2025-11-16 13:18:32.590269286 +0100
|
||||
@@ -1271,6 +1271,18 @@ if(HAVE_SOLVER)
|
||||
if(ENABLE_GMM) # use GMM/MUMPS interface
|
||||
add_definitions(-DGMM_USES_MUMPS)
|
||||
endif()
|
||||
+ else()
|
||||
+ if(ENABLE_GMM) # use GMM/MUMPS interface
|
||||
+ add_definitions(-DGMM_USES_SUPERLU -DGMM_NO_SUPERLU_INCLUDE_SUBDIR)
|
||||
+ find_path(SUPERLU_INC "slu_util.h" PATH_SUFFIXES SuperLU)
|
||||
+ include_directories(${SUPERLU_INC})
|
||||
+ endif()
|
||||
+ endif()
|
||||
+ else()
|
||||
+ if(ENABLE_GMM) # use GMM/MUMPS interface
|
||||
+ add_definitions(-DGMM_USES_SUPERLU -DGMM_NO_SUPERLU_INCLUDE_SUBDIR)
|
||||
+ find_path(SUPERLU_INC "slu_util.h" PATH_SUFFIXES SuperLU)
|
||||
+ include_directories(${SUPERLU_INC})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source-new/CMakeLists.txt
|
||||
--- gmsh-4.10.5-source/CMakeLists.txt 2022-07-03 18:30:12.326025777 +0200
|
||||
+++ gmsh-4.10.5-source-new/CMakeLists.txt 2022-07-03 18:30:12.330025777 +0200
|
||||
@@ -270,7 +270,7 @@ if(ENABLE_RPATH)
|
||||
diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source-new/CMakeLists.txt
|
||||
--- gmsh-4.15.0-source/CMakeLists.txt 2025-11-16 12:11:30.706154249 +0100
|
||||
+++ gmsh-4.15.0-source-new/CMakeLists.txt 2025-11-16 12:11:30.710717577 +0100
|
||||
@@ -278,7 +278,7 @@ if(ENABLE_RPATH)
|
||||
# when building, don't use the install RPATH already (but later on when
|
||||
# installing)
|
||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source-new/CMakeLists.txt
|
||||
--- gmsh-4.10.5-source/CMakeLists.txt 2022-07-03 18:30:11.875025767 +0200
|
||||
+++ gmsh-4.10.5-source-new/CMakeLists.txt 2022-07-03 18:30:12.106025772 +0200
|
||||
@@ -1898,7 +1898,7 @@ endif()
|
||||
diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source-new/CMakeLists.txt
|
||||
--- gmsh-4.15.0-source/CMakeLists.txt 2025-11-16 12:11:30.209672907 +0100
|
||||
+++ gmsh-4.15.0-source-new/CMakeLists.txt 2025-11-16 12:11:30.455854462 +0100
|
||||
@@ -2041,7 +2041,7 @@ endif()
|
||||
if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
|
||||
install(FILES ${GMSH_API} DESTINATION ${GMSH_INC})
|
||||
install(FILES ${GMSH_PY} DESTINATION ${PYTHON3_SITE_PACKAGES})
|
||||
- install(FILES ${GMSH_JL} DESTINATION ${GMSH_LIB})
|
||||
+ install(FILES ${GMSH_JL} DESTINATION share/gmsh)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/METADATA DESTINATION
|
||||
${PYTHON3_SITE_PACKAGES}/gmsh-${GMSH_PYTHON_VERSION}.dist-info)
|
||||
if(ENABLE_PRIVATE_API)
|
||||
install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh)
|
||||
if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference gmsh-4.10.5-source/src/common/CommandLine.cpp gmsh-4.10.5-source-new/src/common/CommandLine.cpp
|
||||
--- gmsh-4.10.5-source/src/common/CommandLine.cpp 2022-04-26 17:50:41.000000000 +0200
|
||||
+++ gmsh-4.10.5-source-new/src/common/CommandLine.cpp 2022-07-03 18:30:11.880025767 +0200
|
||||
diff -rupN --no-dereference gmsh-4.15.0-source/src/common/CommandLine.cpp gmsh-4.15.0-source-new/src/common/CommandLine.cpp
|
||||
--- gmsh-4.15.0-source/src/common/CommandLine.cpp 2025-10-01 16:39:02.000000000 +0200
|
||||
+++ gmsh-4.15.0-source-new/src/common/CommandLine.cpp 2025-11-16 12:11:30.214030834 +0100
|
||||
@@ -42,7 +42,7 @@
|
||||
#endif
|
||||
|
||||
|
|
@ -10,10 +10,10 @@ diff -rupN --no-dereference gmsh-4.10.5-source/src/common/CommandLine.cpp gmsh-4
|
|||
#endif
|
||||
|
||||
#if defined(HAVE_POST)
|
||||
diff -rupN --no-dereference gmsh-4.10.5-source/src/fltk/helpWindow.cpp gmsh-4.10.5-source-new/src/fltk/helpWindow.cpp
|
||||
--- gmsh-4.10.5-source/src/fltk/helpWindow.cpp 2022-01-11 20:34:46.000000000 +0100
|
||||
+++ gmsh-4.10.5-source-new/src/fltk/helpWindow.cpp 2022-07-03 18:30:11.880025767 +0200
|
||||
@@ -36,7 +36,7 @@
|
||||
diff -rupN --no-dereference gmsh-4.15.0-source/src/fltk/helpWindow.cpp gmsh-4.15.0-source-new/src/fltk/helpWindow.cpp
|
||||
--- gmsh-4.15.0-source/src/fltk/helpWindow.cpp 2025-10-01 16:39:02.000000000 +0200
|
||||
+++ gmsh-4.15.0-source-new/src/fltk/helpWindow.cpp 2025-11-16 12:11:30.214367145 +0100
|
||||
@@ -37,7 +37,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_MED)
|
||||
|
|
@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.10.5-source/src/fltk/helpWindow.cpp gmsh-4.10
|
|||
#endif
|
||||
|
||||
static const char *help_link(Fl_Widget *w, const char *uri)
|
||||
diff -rupN --no-dereference gmsh-4.10.5-source/src/geo/GModelIO_MED.cpp gmsh-4.10.5-source-new/src/geo/GModelIO_MED.cpp
|
||||
--- gmsh-4.10.5-source/src/geo/GModelIO_MED.cpp 2022-01-11 20:34:47.000000000 +0100
|
||||
+++ gmsh-4.10.5-source-new/src/geo/GModelIO_MED.cpp 2022-07-03 18:30:11.881025767 +0200
|
||||
diff -rupN --no-dereference gmsh-4.15.0-source/src/geo/GModelIO_MED.cpp gmsh-4.15.0-source-new/src/geo/GModelIO_MED.cpp
|
||||
--- gmsh-4.15.0-source/src/geo/GModelIO_MED.cpp 2025-10-01 16:39:02.000000000 +0200
|
||||
+++ gmsh-4.15.0-source-new/src/geo/GModelIO_MED.cpp 2025-11-16 12:11:30.214658519 +0100
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "discreteVertex.h"
|
||||
#include "Context.h"
|
||||
|
|
@ -34,10 +34,10 @@ diff -rupN --no-dereference gmsh-4.10.5-source/src/geo/GModelIO_MED.cpp gmsh-4.1
|
|||
|
||||
#if(MED_MAJOR_NUM >= 3)
|
||||
// To avoid too many ifdefs below we use defines for the bits of the
|
||||
diff -rupN --no-dereference gmsh-4.10.5-source/src/post/PViewDataGModelIO.cpp gmsh-4.10.5-source-new/src/post/PViewDataGModelIO.cpp
|
||||
--- gmsh-4.10.5-source/src/post/PViewDataGModelIO.cpp 2022-01-11 20:34:48.000000000 +0100
|
||||
+++ gmsh-4.10.5-source-new/src/post/PViewDataGModelIO.cpp 2022-07-03 18:30:11.881025767 +0200
|
||||
@@ -542,7 +542,7 @@ void PViewDataGModel::importLists(int N[
|
||||
diff -rupN --no-dereference gmsh-4.15.0-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.15.0-source-new/src/post/PViewDataGModelIO_MED.cpp
|
||||
--- gmsh-4.15.0-source/src/post/PViewDataGModelIO_MED.cpp 2025-10-01 16:39:03.000000000 +0200
|
||||
+++ gmsh-4.15.0-source-new/src/post/PViewDataGModelIO_MED.cpp 2025-11-16 12:11:30.214886156 +0100
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#if defined(HAVE_MED)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source-new/CMakeLists.txt
|
||||
--- gmsh-4.10.5-source/CMakeLists.txt 2022-07-01 09:37:10.000000000 +0200
|
||||
+++ gmsh-4.10.5-source-new/CMakeLists.txt 2022-07-03 18:30:11.655025762 +0200
|
||||
@@ -1880,6 +1880,8 @@ else()
|
||||
diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source-new/CMakeLists.txt
|
||||
--- gmsh-4.15.0-source/CMakeLists.txt 2025-10-25 17:09:26.000000000 +0200
|
||||
+++ gmsh-4.15.0-source-new/CMakeLists.txt 2025-11-16 12:11:29.982761471 +0100
|
||||
@@ -2001,6 +2001,8 @@ else()
|
||||
set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -9,8 +9,8 @@ diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source
|
|||
+
|
||||
# mark targets as optional so we can install them separately if needed
|
||||
# (e.g. "make lib" or "make shared" followed by "make install/fast")
|
||||
install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
|
||||
@@ -1891,11 +1893,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
|
||||
install(TARGETS gmsh
|
||||
@@ -2034,14 +2036,14 @@ if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHAR
|
||||
endif()
|
||||
|
||||
if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab)
|
||||
|
|
@ -22,12 +22,16 @@ diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source
|
|||
- install(FILES ${GMSH_PY} DESTINATION ${GMSH_LIB})
|
||||
+ install(FILES ${GMSH_PY} DESTINATION ${PYTHON3_SITE_PACKAGES})
|
||||
install(FILES ${GMSH_JL} DESTINATION ${GMSH_LIB})
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/METADATA DESTINATION
|
||||
- ${GMSH_LIB}/gmsh-${GMSH_PYTHON_VERSION}.dist-info)
|
||||
+ ${PYTHON3_SITE_PACKAGES}/gmsh-${GMSH_PYTHON_VERSION}.dist-info)
|
||||
if(ENABLE_PRIVATE_API)
|
||||
install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh)
|
||||
diff -rupN --no-dereference gmsh-4.10.5-source/src/common/GmshMessage.cpp gmsh-4.10.5-source-new/src/common/GmshMessage.cpp
|
||||
--- gmsh-4.10.5-source/src/common/GmshMessage.cpp 2022-04-26 17:50:41.000000000 +0200
|
||||
+++ gmsh-4.10.5-source-new/src/common/GmshMessage.cpp 2022-07-03 18:30:11.655025762 +0200
|
||||
@@ -169,14 +169,6 @@ void Msg::Initialize(int argc, char **ar
|
||||
if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen
|
||||
diff -rupN --no-dereference gmsh-4.15.0-source/src/common/GmshMessage.cpp gmsh-4.15.0-source-new/src/common/GmshMessage.cpp
|
||||
--- gmsh-4.15.0-source/src/common/GmshMessage.cpp 2025-10-01 16:39:02.000000000 +0200
|
||||
+++ gmsh-4.15.0-source-new/src/common/GmshMessage.cpp 2025-11-16 12:11:29.983375719 +0100
|
||||
@@ -177,14 +177,6 @@ void Msg::Initialize(int argc, char **ar
|
||||
if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size())
|
||||
CTX::instance()->exeFileName = _commandLineArgs[0];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source-new/CMakeLists.txt
|
||||
--- gmsh-4.10.5-source/CMakeLists.txt 2022-07-03 18:30:12.543025782 +0200
|
||||
+++ gmsh-4.10.5-source-new/CMakeLists.txt 2022-07-03 18:30:12.758025787 +0200
|
||||
@@ -1624,6 +1624,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB
|
||||
diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source-new/CMakeLists.txt
|
||||
--- gmsh-4.15.0-source/CMakeLists.txt 2025-11-16 12:11:30.943987998 +0100
|
||||
+++ gmsh-4.15.0-source-new/CMakeLists.txt 2025-11-16 12:11:30.948218140 +0100
|
||||
@@ -1728,6 +1728,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source
|
|||
# Linux-specific linker options
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
if(HAVE_OCC)
|
||||
diff -rupN --no-dereference gmsh-4.10.5-source/src/graphics/CMakeLists.txt gmsh-4.10.5-source-new/src/graphics/CMakeLists.txt
|
||||
--- gmsh-4.10.5-source/src/graphics/CMakeLists.txt 2022-01-11 20:34:47.000000000 +0100
|
||||
+++ gmsh-4.10.5-source-new/src/graphics/CMakeLists.txt 2022-07-03 18:30:12.758025787 +0200
|
||||
diff -rupN --no-dereference gmsh-4.15.0-source/src/graphics/CMakeLists.txt gmsh-4.15.0-source-new/src/graphics/CMakeLists.txt
|
||||
--- gmsh-4.15.0-source/src/graphics/CMakeLists.txt 2025-10-01 16:39:02.000000000 +0200
|
||||
+++ gmsh-4.15.0-source-new/src/graphics/CMakeLists.txt 2025-11-16 12:11:30.948782419 +0100
|
||||
@@ -15,7 +15,6 @@ set(SRC
|
||||
drawScales.cpp
|
||||
drawGraph2d.cpp
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (gmsh-4.10.5-source-fedora.tar.xz) = 34ae13ba8f629fd64974f98bf9a28ca3decb48b8035adfd1d3dcf2f22cfc4f11ebdf726f323ce9cccdf587917cd3994f0d02196b50e9c98e2c220d09c7d17d50
|
||||
SHA512 (gmsh-4.15.0-source-fedora.tar.xz) = eac4f6e8cd342ec07e1a83cae966d81716e1d158398ed930c82322b61785f8ab38c84ec07efc91f7be523d872e3331e1a64ce81b20a8c899a82107fab9834add
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue