aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2021-04-24 01:30:19 +0800
committerGitHub <noreply@github.com>2021-04-23 10:30:19 -0700
commit529efa799d25d2431902ffecb4222acd99e3d5a8 (patch)
tree110d10de56ef0ff94b9a746b1e4fb04da5b0ad05
parent8067f8a110485a90b3d4f24b2c6ca5676912f940 (diff)
downloadvcpkg-529efa799d25d2431902ffecb4222acd99e3d5a8.tar.gz
vcpkg-529efa799d25d2431902ffecb4222acd99e3d5a8.zip
[matplotplusplus] Install extra 3rd libraries (#17461)
* [matplotplusplus] Install extra 3rd libraries * update version record
-rw-r--r--ports/matplotplusplus/install-3rd-libraries.patch13
-rw-r--r--ports/matplotplusplus/portfile.cmake1
-rw-r--r--ports/matplotplusplus/vcpkg.json1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/m-/matplotplusplus.json5
5 files changed, 21 insertions, 1 deletions
diff --git a/ports/matplotplusplus/install-3rd-libraries.patch b/ports/matplotplusplus/install-3rd-libraries.patch
new file mode 100644
index 000000000..fc2826999
--- /dev/null
+++ b/ports/matplotplusplus/install-3rd-libraries.patch
@@ -0,0 +1,13 @@
+diff --git a/source/3rd_party/CMakeLists.txt b/source/3rd_party/CMakeLists.txt
+index 52f20eb..ab58bbd 100644
+--- a/source/3rd_party/CMakeLists.txt
++++ b/source/3rd_party/CMakeLists.txt
+@@ -41,6 +41,8 @@ endif()
+ if(MASTER_PROJECT AND NOT BUILD_SHARED_LIBS)
+ install(TARGETS nodesoup
+ EXPORT Matplot++Targets
++ RUNTIME DESTINATION bin
++ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/Matplot++)
+ endif()
+
diff --git a/ports/matplotplusplus/portfile.cmake b/ports/matplotplusplus/portfile.cmake
index 22ef026e0..82901c5c5 100644
--- a/ports/matplotplusplus/portfile.cmake
+++ b/ports/matplotplusplus/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
REF 36d8dc6c3b94b7a71c4f129763f2c6ad8fc0b54a
SHA512 ac8902e953a2a9f6bd62e14e2eb0bd42e407bae6c0b2921ad16ce547e4921ba2c8d8a9cc68e75831676dce3cd89cdf8294862710e838510b68e20f8a6cdf806f
HEAD_REF master
+ PATCHES install-3rd-libraries.patch # Remove this patch when nodesoup is added in vcpkg
)
vcpkg_check_features(
diff --git a/ports/matplotplusplus/vcpkg.json b/ports/matplotplusplus/vcpkg.json
index 4830e9353..a664421f8 100644
--- a/ports/matplotplusplus/vcpkg.json
+++ b/ports/matplotplusplus/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "matplotplusplus",
"version-date": "2021-04-11",
+ "port-version": 1,
"description": "A C++ graphics library for data visualization",
"homepage": "https://alandefreitas.github.io/matplotplusplus/",
"license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index c09dced8c..b6192117a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3850,7 +3850,7 @@
},
"matplotplusplus": {
"baseline": "2021-04-11",
- "port-version": 0
+ "port-version": 1
},
"matroska": {
"baseline": "1.6.2",
diff --git a/versions/m-/matplotplusplus.json b/versions/m-/matplotplusplus.json
index b163a0b79..4f690fdb1 100644
--- a/versions/m-/matplotplusplus.json
+++ b/versions/m-/matplotplusplus.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "1daed23f0dc56cccb47adb60cee246cac3d8cdbd",
+ "version-date": "2021-04-11",
+ "port-version": 1
+ },
+ {
"git-tree": "e4cf18b9e9c16d294f966bae3d1d89ecd698a47f",
"version-date": "2021-04-11",
"port-version": 0