mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 01:24:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ryu] ryuConfig.cmake now selects the correct libraries when cross compiling (#16858)

Browse Source 
* 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>
This commit is contained in:
georg-emg 2021-03-26 19:39:45 +01:00 committed by GitHub
parent be656b22a4
commit 73edefd877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/ryu/ryuConfig.cmake
View File

@ -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()
endif()

2
ports/ryu/vcpkg.json
View File

@ -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)"

2
versions/baseline.json
View File

@ -5298,7 +5298,7 @@
},
"ryu": {
"baseline": "2.0",
"port-version": 3
"port-version": 4
},
"safeint": {
"baseline": "3.24",

5
versions/r-/ryu.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0f8ca7269cbb4141e7576295e2427a4208341aba",
"version-string": "2.0",
"port-version": 4
},
{
"git-tree": "faaef55aea17b88d0328989a64d948d8a09d7559",
"version-string": "2.0",