diff --git a/ports/toml11/portfile.cmake b/ports/toml11/portfile.cmake index 46e042e2a4..3e5729bc78 100644 --- a/ports/toml11/portfile.cmake +++ b/ports/toml11/portfile.cmake @@ -1,28 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ToruNiina/toml11 - REF v3.5.0 - SHA512 19c6ee42aa1e186689062e5d2be05f375c8ae4be40be4b6a8e803a642f37214270d5600ccec3d06b4e69aec6896d823e3a8faea29a41643279922d1fe9fae70a + REF v3.7.0 + SHA512 093833ea4354ab91f54c0a346e51d38e297b8c347241f679c023e65fe580edca7852d934a0a0d371524426f61e58ee3a9638061b1230cd72be7ff55fcf12370c HEAD_REF master ) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS -Dtoml11_BUILD_TEST=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/toml11 TARGET_PATH share/toml11) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/toml11) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/toml11/toml11Config.cmake + "${CURRENT_PACKAGES_DIR}/share/toml11/toml11Config.cmake" "\${PACKAGE_PREFIX_DIR}/lib/cmake/toml11/toml11Targets.cmake" "\${PACKAGE_PREFIX_DIR}/share/toml11/toml11Targets.cmake" ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/toml11/vcpkg.json b/ports/toml11/vcpkg.json index b6577aafd4..de82e84e0d 100644 --- a/ports/toml11/vcpkg.json +++ b/ports/toml11/vcpkg.json @@ -1,7 +1,16 @@ { "name": "toml11", - "version-string": "3.5.0", - "port-version": 2, + "version": "3.7.0", "description": "A C++11 header-only toml parser/encoder depending only on C++ standard library.", - "homepage": "https://github.com/ToruNiina/toml11" + "homepage": "https://github.com/ToruNiina/toml11", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 052eca64df..0bfb07959e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6725,8 +6725,8 @@ "port-version": 5 }, "toml11": { - "baseline": "3.5.0", - "port-version": 2 + "baseline": "3.7.0", + "port-version": 0 }, "tomlplusplus": { "baseline": "2.5.0", diff --git a/versions/t-/toml11.json b/versions/t-/toml11.json index 1cc599ac7f..6012bfd518 100644 --- a/versions/t-/toml11.json +++ b/versions/t-/toml11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab8e69aef0551e2e862e74ec70b5c2dd58aac36b", + "version": "3.7.0", + "port-version": 0 + }, { "git-tree": "dabcb8338003184011c1b13e49561f9c112a9735", "version-string": "3.5.0",