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.

Sign up for GitHub

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

Jump to bottom

[mathgl] missing internal dep #31013

Merged
merged 2 commits into from
Apr 26, 2023
Merged

[mathgl] missing internal dep #31013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c495fc
[mathgl] missing internal dep
autoantwort Apr 21, 2023
63ddc21
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Apr 21, 2023
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
14 changes: 14 additions & 0 deletions ports/mathgl/fix-include-property.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d44125c..1ad17a1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,6 +53,9 @@ generate_export_header(mgl EXPORT_FILE_NAME ../include/mgl2/dllexport.h)
target_link_libraries(mgl ${MGL_DEP_LIBS})
target_link_libraries(mgl-static ${MGL_DEP_LIBS})

+target_include_directories(mgl PUBLIC $<INSTALL_INTERFACE:include>)
+target_include_directories(mgl-static PUBLIC $<INSTALL_INTERFACE:include>)
+
mgl_po_src(${mgl_src} ${mgl_hdr})

if(MGL_HAVE_MPI)
1 change: 1 addition & 0 deletions ports/mathgl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ vcpkg_from_sourceforge(
fix-format-specifiers.patch
fix-glut.patch
fix-mgllab.patch
fix-include-property.patch
)
file(REMOVE_RECURSE "${SOURCE_PATH}/addons/getopt")

Expand Down
10 changes: 9 additions & 1 deletion ports/mathgl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "mathgl",
"version": "8.0.1",
"port-version": 1,
"description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions",
"license": "GPL-3.0-only",
"supports": "!uwp",
Expand Down Expand Up @@ -98,7 +99,14 @@
"png": {
"description": "png module",
"dependencies": [
"libpng"
"libpng",
{
"name": "mathgl",
"default-features": false,
"features": [
"zlib"
]
}
]
},
"qt5": {
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5046,7 +5046,7 @@
},
"mathgl": {
"baseline": "8.0.1",
"port-version": 0
"port-version": 1
},
"matio": {
"baseline": "1.5.23",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mathgl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "edd98363d2569c9ef358506313ce110045708f6a",
"version": "8.0.1",
"port-version": 1
},
{
"git-tree": "8fd2208b95f6ebc6f17a30cc79c3b57b1a8bcfb7",
"version": "8.0.1",
Expand Down