From 16cb5ff369b4997ddc8c2974106f7aecc1d1e78e Mon Sep 17 00:00:00 2001 From: georg-emg <71000124+georg-emg@users.noreply.github.com> Date: Fri, 30 Apr 2021 00:45:22 +0200 Subject: [ryu] fixed syntax error in ryuConfig.cmake (#17306) * ryuConfig.cmake now checks the target rather than the host system to decide whether to install ryu.lib or linryu.a * executed vcpkg x-add-version ryu * Update ports/ryu/ryuConfig.cmake Co-authored-by: Robert Schumacher * executed vcpkg x-add-version ryu * fixed a syntax error in ports/ryu/ryuConfig.cmake * vcpkg x-add-version ryu Co-authored-by: Robert Schumacher --- ports/ryu/ryuConfig.cmake | 4 ++-- ports/ryu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/ryu.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/ryu/ryuConfig.cmake b/ports/ryu/ryuConfig.cmake index 196301e4f..76e489d19 100644 --- a/ports/ryu/ryuConfig.cmake +++ b/ports/ryu/ryuConfig.cmake @@ -18,8 +18,8 @@ find_library(RYU_RELEASE_LIB ryu PATHS "${ROOT}/lib" NO_DEFAULT_PATH) find_library(RYU_DEBUG_LIB ryu PATHS "${ROOT}/debug/lib" NO_DEFAULT_PATH) find_library(RYUPF_RELEASE_LIB ryu_printf PATHS "${ROOT}/lib" NO_DEFAULT_PATH) find_library(RYUPF_DEBUG_LIB ryu_printf PATHS "${ROOT}/debug/lib" NO_DEFAULT_PATH) -set_library_target("RYU" "ryu" "${RYU_DEBUG_LIB} "${RYU_RELEASE_LIB}" "${ROOT}/include/") -set_library_target("RYU" "ryu_printf" "${RYUPF_DEBUG_LIB} "${RYUPF_RELEASE_LIB}" "${ROOT}/include/") +set_library_target("RYU" "ryu" "${RYU_DEBUG_LIB}" "${RYU_RELEASE_LIB}" "${ROOT}/include/") +set_library_target("RYU" "ryu_printf" "${RYUPF_DEBUG_LIB}" "${RYUPF_RELEASE_LIB}" "${ROOT}/include/") else() set_library_target("RYU" "ryu" "${ROOT}/debug/lib/libryu.a" "${ROOT}/lib/libryu.a" "${ROOT}/include/") set_library_target("RYU" "ryu_printf" "${ROOT}/debug/lib/libryu_printf.a" "${ROOT}/lib/libryu_printf.a" "${ROOT}/include/") diff --git a/ports/ryu/vcpkg.json b/ports/ryu/vcpkg.json index 93370f3a7..52d1ea6d7 100644 --- a/ports/ryu/vcpkg.json +++ b/ports/ryu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ryu", "version-string": "2.0", - "port-version": 4, + "port-version": 5, "description": "Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.", "homepage": "https://github.com/ulfjack/ryu", "supports": "!(uwp | arm | x86)" diff --git a/versions/baseline.json b/versions/baseline.json index 5ab3dbdff..b0eb94ad8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5418,7 +5418,7 @@ }, "ryu": { "baseline": "2.0", - "port-version": 4 + "port-version": 5 }, "safeint": { "baseline": "3.24", diff --git a/versions/r-/ryu.json b/versions/r-/ryu.json index 0c1d1b31d..5bad84baa 100644 --- a/versions/r-/ryu.json +++ b/versions/r-/ryu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e620954b8262664cd847436d34b412bc89292854", + "version-string": "2.0", + "port-version": 5 + }, { "git-tree": "0f8ca7269cbb4141e7576295e2427a4208341aba", "version-string": "2.0", -- cgit v1.2.3