diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-06-12 00:22:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 09:22:35 -0700 |
| commit | c379c527bd52816186a5faf92df7401ce8f861bf (patch) | |
| tree | 33e7dc32057f6482d4077c807f7decbaa9ecc878 /ports/matplotplusplus | |
| parent | 0fa821a46e7035ea790294b5ad7ace69ef56f9bd (diff) | |
| download | vcpkg-c379c527bd52816186a5faf92df7401ce8f861bf.tar.gz vcpkg-c379c527bd52816186a5faf92df7401ce8f861bf.zip | |
[matplotplusplus] Re-fix 3rd libraries installation (#18306)
* [matplotplusplus] Re-fix 3rd libraries installation.
* update version record
Diffstat (limited to 'ports/matplotplusplus')
| -rw-r--r-- | ports/matplotplusplus/install-3rd-libraries.patch | 8 | ||||
| -rw-r--r-- | ports/matplotplusplus/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/matplotplusplus/vcpkg.json | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/ports/matplotplusplus/install-3rd-libraries.patch b/ports/matplotplusplus/install-3rd-libraries.patch index fc2826999..d4b139b58 100644 --- a/ports/matplotplusplus/install-3rd-libraries.patch +++ b/ports/matplotplusplus/install-3rd-libraries.patch @@ -1,13 +1,15 @@ diff --git a/source/3rd_party/CMakeLists.txt b/source/3rd_party/CMakeLists.txt -index 52f20eb..ab58bbd 100644 +index bef0c08..e7521a7 100644 --- a/source/3rd_party/CMakeLists.txt +++ b/source/3rd_party/CMakeLists.txt -@@ -41,6 +41,8 @@ endif() +@@ -41,7 +41,9 @@ endif() if(MASTER_PROJECT AND NOT BUILD_SHARED_LIBS) install(TARGETS nodesoup EXPORT Matplot++Targets +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/Matplot++) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/Matplot++) ++ ARCHIVE DESTINATION lib) endif() + diff --git a/ports/matplotplusplus/portfile.cmake b/ports/matplotplusplus/portfile.cmake index a332d9210..21d805e5d 100644 --- a/ports/matplotplusplus/portfile.cmake +++ b/ports/matplotplusplus/portfile.cmake @@ -49,12 +49,12 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/cmake/Matplot++/matplot++-config.cmake - ${CURRENT_PACKAGES_DIR}/lib/cmake/Matplot++/Matplot++-config.cmake + "${CURRENT_PACKAGES_DIR}/lib/cmake/Matplot++/matplot++-config.cmake" + "${CURRENT_PACKAGES_DIR}/lib/cmake/Matplot++/Matplot++-config.cmake" ) vcpkg_cmake_config_fixup(PACKAGE_NAME Matplot++ CONFIG_PATH lib/cmake/Matplot++) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/matplotplusplus/vcpkg.json b/ports/matplotplusplus/vcpkg.json index 8d88d5005..378a31493 100644 --- a/ports/matplotplusplus/vcpkg.json +++ b/ports/matplotplusplus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "matplotplusplus", "version-date": "2021-04-11", - "port-version": 2, + "port-version": 3, "description": "A C++ graphics library for data visualization", "homepage": "https://alandefreitas.github.io/matplotplusplus/", "license": "MIT", |