diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2021-02-28 13:17:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 13:17:19 -0800 |
| commit | 3426db05b996481ca31e95fff3734cf23e0f51bc (patch) | |
| tree | f6fada40f86391d87ba0b093f0c17f169d125912 /ports/fmt | |
| parent | e25b620cf90d9bb311f91b03916b75d8798afd44 (diff) | |
| download | vcpkg-3426db05b996481ca31e95fff3734cf23e0f51bc.tar.gz vcpkg-3426db05b996481ca31e95fff3734cf23e0f51bc.zip | |
[scripts-audit] Rollup PR 2021-02-26 (#16440)
* [scripts-audit rollup] PR #16419
* pull the cmake doc comment parsing out into its own function
* support cmake helper ports
* add real support for deprecation, as opposed to ad-hoc
* [scripts-audit rollup] PR #16192
* add a z_ in front of internal functions
* move internal functions out
set feature_vars again in parent scope
* [scripts-audit rollup] PR #16309
Audit vcpkg_copy_pdbs
* [scripts-audit rollup] PR #16304
* Fix usage, documentation
* [scripts-audit rollup] PR #16393
* [scripts-audit rollup] PR #16377
Deprecate `vcpkg_*_cmake` in favor of `vcpkg_cmake_*` from the
`vcpkg-cmake` port, as well as `vcpkg_fixup_cmake_targets`
in favor of `vcpkg_cmake_config_fixup` from the
`vcpkg-cmake-config` port.
Diffstat (limited to 'ports/fmt')
| -rw-r--r-- | ports/fmt/CONTROL | 5 | ||||
| -rw-r--r-- | ports/fmt/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/fmt/vcpkg.json | 17 |
3 files changed, 20 insertions, 9 deletions
diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL deleted file mode 100644 index 23ea3ec68..000000000 --- a/ports/fmt/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: fmt -Version: 7.1.3 -Port-Version: 0 -Homepage: https://github.com/fmtlib/fmt -Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams. diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 692314ff2..c91f568a2 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -6,16 +6,15 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-warning4189.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DFMT_CMAKE_DIR=share/fmt -DFMT_TEST=OFF -DFMT_DOC=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_TARGET_IS_WINDOWS) @@ -40,7 +39,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() if(VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json new file mode 100644 index 000000000..debc7b8e3 --- /dev/null +++ b/ports/fmt/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "fmt", + "version": "7.1.3", + "port-version": 1, + "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", + "homepage": "https://github.com/fmtlib/fmt", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} |