diff options
| author | georg-emg <71000124+georg-emg@users.noreply.github.com> | 2021-03-26 19:39:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 11:39:45 -0700 |
| commit | 73edefd8775d3897914b68b3664d19a81de2991e (patch) | |
| tree | 75c091fe8073d2700f9c34319556618aef17cfe4 | |
| parent | be656b22a454b5ef3bb56113f5bf4c53b75fdba3 (diff) | |
| download | vcpkg-73edefd8775d3897914b68b3664d19a81de2991e.tar.gz vcpkg-73edefd8775d3897914b68b3664d19a81de2991e.zip | |
[ryu] ryuConfig.cmake now selects the correct libraries when cross compiling (#16858)
* 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 <roschuma@microsoft.com>
* executed vcpkg x-add-version ryu
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/ryu/ryuConfig.cmake | 12 | ||||
| -rw-r--r-- | ports/ryu/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/r-/ryu.json | 5 |
4 files changed, 15 insertions, 6 deletions
diff --git a/ports/ryu/ryuConfig.cmake b/ports/ryu/ryuConfig.cmake index 43421ff9e..196301e4f 100644 --- a/ports/ryu/ryuConfig.cmake +++ b/ports/ryu/ryuConfig.cmake @@ -13,10 +13,14 @@ get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(ROOT "${ROOT}" PATH) get_filename_component(ROOT "${ROOT}" PATH) -if (CMAKE_HOST_WIN32) -set_library_target("RYU" "ryu" "${ROOT}/debug/lib/ryu.lib" "${ROOT}/lib/ryu.lib" "${ROOT}/include/") -set_library_target("RYU" "ryu_printf" "${ROOT}/debug/lib/ryu_printf.lib" "${ROOT}/lib/ryu_printf.lib" "${ROOT}/include/") +if (TRUE) +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/") 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/") -endif()
\ No newline at end of file +endif() diff --git a/ports/ryu/vcpkg.json b/ports/ryu/vcpkg.json index e7d7619aa..93370f3a7 100644 --- a/ports/ryu/vcpkg.json +++ b/ports/ryu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ryu", "version-string": "2.0", - "port-version": 3, + "port-version": 4, "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 dc4115289..41a5127e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5298,7 +5298,7 @@ }, "ryu": { "baseline": "2.0", - "port-version": 3 + "port-version": 4 }, "safeint": { "baseline": "3.24", diff --git a/versions/r-/ryu.json b/versions/r-/ryu.json index 0576a5182..0c1d1b31d 100644 --- a/versions/r-/ryu.json +++ b/versions/r-/ryu.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "0f8ca7269cbb4141e7576295e2427a4208341aba", + "version-string": "2.0", + "port-version": 4 + }, + { "git-tree": "faaef55aea17b88d0328989a64d948d8a09d7559", "version-string": "2.0", "port-version": 3 |