mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:06:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[cminpack] Fix dllexport and pc files (#31667)

Browse Source
This commit is contained in:
Kai Pastor 2023-05-30 21:05:11 +02:00 committed by GitHub
parent 5fd868c533
commit 2549b40a94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ports/cminpack/portfile.cmake
View File

@ -1,9 +1,19 @@
# Must be removed on next release
vcpkg_download_distfile(DLLEXPORT_PATCH
URLS https://github.com/devernay/cminpack/commit/0d40c5359674448aa6f78accaddca1d79befff1f.patch?full_index=1
FILENAME devernay-cminpack-pr-50-dllexport.patch
SHA512 558c21c4d43ff64a38945643810eafaee46c5f61c0e2a98931f9ba2283cf46e234a74f12ce6db4e64289de58f8da190af936f847f42636fd812fdf82ff733763
)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO devernay/cminpack REPO devernay/cminpack
REF v1.3.8 REF v1.3.8
SHA512 0cab275074a31af69dbaf3ef6d41b20184c7cf9f33c78014a69ae7a022246fa79e7b4851341c6934ca1e749955b7e1096a40b4300a109ad64ebb1b2ea5d1d8ae SHA512 0cab275074a31af69dbaf3ef6d41b20184c7cf9f33c78014a69ae7a022246fa79e7b4851341c6934ca1e749955b7e1096a40b4300a109ad64ebb1b2ea5d1d8ae
PATCHES
${DLLEXPORT_PATCH}
) )
vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" [[ STRING "CMinpack]] [[) # ("CMinpack]])
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
@ -19,5 +29,16 @@ vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cminpack-1/cminpack.h" [[!defined(CMINPACK_NO_DLL)]] 0)
endif()
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpack.pc" "-lcminpack" "-lcminpack_d")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpacks.pc" "-lcminpacks" "-lcminpacks_d")
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpackld.pc")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpackld.pc" "-lcminpackld" "-lcminpackld_d")
endif()
endif()
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/CopyrightMINPACK.txt") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/CopyrightMINPACK.txt")

2
ports/cminpack/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "cminpack", "name": "cminpack",
"version": "1.3.8", "version": "1.3.8",
"port-version": 3, "port-version": 4,
"description": "A C/C++ rewrite of the MINPACK software (originally in FORTRAN) for solving nonlinear equations and nonlinear least squares problems", "description": "A C/C++ rewrite of the MINPACK software (originally in FORTRAN) for solving nonlinear equations and nonlinear least squares problems",
"homepage": "http://devernay.free.fr/hacks/cminpack/", "homepage": "http://devernay.free.fr/hacks/cminpack/",
"license": null, "license": null,

2
versions/baseline.json
View File

@ -1610,7 +1610,7 @@
}, },
"cminpack": { "cminpack": {
"baseline": "1.3.8", "baseline": "1.3.8",
"port-version": 3 "port-version": 4
}, },
"cmocka": { "cmocka": {
"baseline": "2020-08-01", "baseline": "2020-08-01",

5
versions/c-/cminpack.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0401d2c926529b034913ab84852eef3fac28f6d4",
"version": "1.3.8",
"port-version": 4
},
{ {
"git-tree": "c2b1d33d31878445649cbc22e23d10a7b0e5d0b3", "git-tree": "c2b1d33d31878445649cbc22e23d10a7b0e5d0b3",
"version": "1.3.8", "version": "1.3.8",