diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-10-13 08:09:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 17:09:17 -0700 |
| commit | f978be65342f21f08e066c97d036bc1b3634810c (patch) | |
| tree | c8cb9d1734efc199627c774b9f1c86166f3b5774 /ports | |
| parent | b8c39998eaf82ed3b397cfb73063b6810772c365 (diff) | |
| download | vcpkg-f978be65342f21f08e066c97d036bc1b3634810c.tar.gz vcpkg-f978be65342f21f08e066c97d036bc1b3634810c.zip | |
[ryml] Support osx (#20661)
* [ryml] Support osx
* Update deprecated functions
* Remove supports field
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ryml/portfile.cmake | 23 | ||||
| -rw-r--r-- | ports/ryml/vcpkg.json | 10 |
2 files changed, 17 insertions, 16 deletions
diff --git a/ports/ryml/portfile.cmake b/ports/ryml/portfile.cmake index f3e2bf5c2..152c7c9e8 100644 --- a/ports/ryml/portfile.cmake +++ b/ports/ryml/portfile.cmake @@ -1,9 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-vcpkg_fail_port_install(
- ON_TARGET "OSX"
-)
-
# Get rapidyaml src
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@@ -38,21 +34,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS dbg RYML_DBG
)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
vcpkg_copy_pdbs()
-if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
- vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
-elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ryml)
- vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ryml)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
+ vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
+elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/ryml")
+ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ryml)
endif()
# Move headers and natvis to own dir
@@ -72,6 +67,4 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/share/ryml/rymlConfig.cmake" "${_contents}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL
- "${SOURCE_PATH}/LICENSE.txt"
- DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file diff --git a/ports/ryml/vcpkg.json b/ports/ryml/vcpkg.json index 01ec79dea..a11054bd4 100644 --- a/ports/ryml/vcpkg.json +++ b/ports/ryml/vcpkg.json @@ -1,13 +1,21 @@ { "name": "ryml", "version-date": "2021-07-24", + "port-version": 1, "description": "Rapid YAML library", "homepage": "https://github.com/biojppm/rapidyaml", - "supports": "!osx", "dependencies": [ { "name": "c4core", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ |