[readosm] Revise portfile, install pc file for windows #21599
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/readosm.pc.in b/readosm.pc.in | ||
| index c1a0961..2417433 100644 | ||
| --- a/readosm.pc.in | ||
| +++ b/readosm.pc.in | ||
| @@ -8,5 +8,6 @@ includedir=@includedir@ | ||
| Name: readosm | ||
| Description: a simple library parsing Open Street Map files | ||
| Version: @VERSION@ | ||
| -Libs: -L${libdir} -lreadosm -lz -lexpat | ||
| +Requires.private: expat zlib | ||
| +Libs: -L${libdir} -lreadosm | ||
| Cflags: -I${includedir} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,90 @@ | ||
| set(READOSM_VERSION_STR "1.1.0a") | ||
| vcpkg_download_distfile(ARCHIVE | ||
| URLS "https://www.gaia-gis.it/gaia-sins/readosm-sources/readosm-${READOSM_VERSION_STR}.tar.gz" | ||
| FILENAME "readosm-${READOSM_VERSION_STR}.tar.gz" | ||
| SHA512 ec8516cdd0b02027cef8674926653f8bc76e2082c778b02fb2ebcfa6d01e21757aaa4fd5d5104059e2f5ba97190183e60184f381bfd592a635805aa35cd7a682 | ||
| ) | ||
|
|
||
| vcpkg_extract_source_archive(SOURCE_PATH | ||
| ARCHIVE "${ARCHIVE}" | ||
| PATCHES | ||
| fix-makefiles.patch | ||
| pc-file.patch | ||
| ) | ||
|
|
||
| set(PKGCONFIG_MODULES expat zlib) | ||
|
|
||
JackBoosY marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) | ||
| x_vcpkg_pkgconfig_get_modules( | ||
| PREFIX PKGCONFIG | ||
| MODULES --msvc-syntax ${PKGCONFIG_MODULES} | ||
| LIBS | ||
| ) | ||
|
|
||
| if(VCPKG_TARGET_IS_UWP) | ||
| set(UWP_LIBS windowsapp.lib) | ||
| set(UWP_LINK_FLAGS /APPCONTAINER) | ||
| endif() | ||
|
|
||
| file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR) | ||
|
|
||
| vcpkg_install_nmake( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS_RELEASE | ||
| "INSTDIR=${INST_DIR}" | ||
| "LINK_FLAGS=${UWP_LINK_FLAGS}" | ||
| "LIBS_ALL=${PKGCONFIG_LIBS_RELEASE} ${UWP_LIBS}" | ||
| OPTIONS_DEBUG | ||
| "INSTDIR=${INST_DIR}\\debug" | ||
| "LINK_FLAGS=${UWP_LINK_FLAGS} /debug" | ||
| "LIBS_ALL=${PKGCONFIG_LIBS_DEBUG} ${UWP_LIBS}" | ||
| ) | ||
|
|
||
| if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") | ||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") | ||
| file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib") | ||
| file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib") | ||
| else() | ||
| file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/readosm.lib") | ||
| file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib") | ||
| file(RENAME "${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib" "${CURRENT_PACKAGES_DIR}/lib/readosm.lib") | ||
| file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib") | ||
| endif() | ||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") | ||
|
|
||
| set(infile "${SOURCE_PATH}/readosm.pc.in") | ||
| set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/readosm.pc") | ||
| set(VERSION "${READOSM_VERSION_STR}") | ||
| set(exec_prefix [[${prefix}]]) | ||
| set(libdir [[${prefix}/lib]]) | ||
| set(includedir [[${prefix}/include]]) | ||
| list(JOIN pkg_config_modules " " requires_private) | ||
| configure_file("${infile}" "${outfile}" @ONLY) | ||
| if(NOT DEFINED VCPKG_BUILD_TYPE) | ||
| set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/readosm.pc") | ||
| set(includedir [[${prefix}/../include]]) | ||
| configure_file("${infile}" "${outfile}" @ONLY) | ||
| endif() | ||
|
|
||
| else() | ||
| x_vcpkg_pkgconfig_get_modules( | ||
| PREFIX PKGCONFIG | ||
| MODULES ${PKGCONFIG_MODULES} | ||
| LIBS | ||
| ) | ||
| vcpkg_configure_make( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| AUTOCONFIG | ||
| OPTIONS_RELEASE | ||
| "LIBS=${PKGCONFIG_LIBS_RELEASE} \$LIBS" | ||
| OPTIONS_DEBUG | ||
| "LIBS=${PKGCONFIG_LIBS_DEBUG} \$LIBS" | ||
| ) | ||
|
|
||
| vcpkg_install_make() | ||
| endif() | ||
|
|
||
| vcpkg_fixup_pkgconfig() | ||
|
|
||
| # Handle copyright | ||
| file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,15 @@ | ||
| { | ||
| "name": "readosm", | ||
| "version-string": "1.1.0a", | ||
| "port-version": 2, | ||
| "description": "ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf)", | ||
| "homepage": "https://www.gaia-gis.it/gaia-sins/readosm-sources", | ||
| "dependencies": [ | ||
| "expat", | ||
| { | ||
| "name": "vcpkg-pkgconfig-get-modules", | ||
| "host": true | ||
| }, | ||
| "zlib" | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1663,8 +1663,8 @@ open62541:x64-windows-static-md=fail | |
| openscap:x64-windows-static-md=fail | ||
| portmidi:x64-windows-static-md=fail | ||
| quantlib:x64-windows-static-md=fail | ||
| sentencepiece:x64-windows-static-md=fail | ||
| spatialite-tools:x64-windows-static-md=fail | ||
|
Contributor
Author
There was a problem hiding this comment. To be revisited and probably fixed with #21594. (Used to be cascaded from the readosm fail entry.) |
||
| symengine:x64-windows-static-md=fail | ||
| teemo:x64-windows-static-md=fail | ||
| unicorn:x64-windows-static-md=fail | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.