diff --git a/ports/cminpack/portfile.cmake b/ports/cminpack/portfile.cmake index d01068df66..0637dc65e8 100644 --- a/ports/cminpack/portfile.cmake +++ b/ports/cminpack/portfile.cmake @@ -13,9 +13,10 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# # Handle copyright -file(INSTALL "${SOURCE_PATH}/CopyrightMINPACK.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/CopyrightMINPACK.txt") diff --git a/ports/cminpack/usage b/ports/cminpack/usage new file mode 100644 index 0000000000..d1a0fe724a --- /dev/null +++ b/ports/cminpack/usage @@ -0,0 +1,9 @@ +cminpack provides CMake targets: + + find_package(CMinpack CONFIG REQUIRED) + target_link_libraries(main PRIVATE cminpack::cminpack) + + # alternative for single precision + target_link_libraries(main PRIVATE cminpack::cminpacks) + # alternative for long double precision + target_link_libraries(main PRIVATE cminpack::cminpackld) diff --git a/ports/cminpack/vcpkg.json b/ports/cminpack/vcpkg.json index aa37c1135b..fc029f52d5 100644 --- a/ports/cminpack/vcpkg.json +++ b/ports/cminpack/vcpkg.json @@ -1,13 +1,18 @@ { "name": "cminpack", "version": "1.3.8", - "port-version": 1, + "port-version": 2, "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/", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 0b8a835516..a7962c237c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1574,7 +1574,7 @@ }, "cminpack": { "baseline": "1.3.8", - "port-version": 1 + "port-version": 2 }, "cmocka": { "baseline": "2020-08-01", diff --git a/versions/c-/cminpack.json b/versions/c-/cminpack.json index 5ea16de6da..7630563636 100644 --- a/versions/c-/cminpack.json +++ b/versions/c-/cminpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "141d26f7fd5eb7d8bebdabbbb05d4ca23fd8fbbf", + "version": "1.3.8", + "port-version": 2 + }, { "git-tree": "6e903be11f8d868d5fb74f597bc0d2890854eb95", "version": "1.3.8",