diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-08-17 23:33:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 08:33:44 -0700 |
| commit | d6285bc24b2e48da2f5e057fc759aff7c2b3b0af (patch) | |
| tree | 0ae728a70e64d9758f6a918e515171f83424116b /ports/readosm | |
| parent | 5dd2b6736b7397e740d54ec2d748b56bd56350e9 (diff) | |
| download | vcpkg-d6285bc24b2e48da2f5e057fc759aff7c2b3b0af.tar.gz vcpkg-d6285bc24b2e48da2f5e057fc759aff7c2b3b0af.zip | |
[expat] Update the version to 2.2.9 (add support for uwp) (#9146)
* [expat] Update the version to 2.2.9(support uwp)
* [readosm] Fix expat.lib cannot be found
* Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt
* [apr-util,io2d,skia] Fix expat cannot be found and also update expat
* [many ports] Add supports and fix the regressions
* Fix new regressions
* Fix typo
* [io2d] Update expat patch
* [io2d,libkml,skia] Fix expat cannot find and also fix typo
* [expat] Remove usage
* [libkml,vtk] Update expat patch and fix static build
* [wxwidgets] Fix static build caused by expat cannot found
* Update as review suggestion
* Add Port-Version
* Remove evpp:x64-osx=fail from ci.baseline.txt
* [wxwidgest] Remove unnecessary spaces
* [itk] Fix expat cannot be found
* fix cmake test port
* [wxwidgets] Update Port-Version
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/readosm')
| -rw-r--r-- | ports/readosm/CONTROL | 4 | ||||
| -rw-r--r-- | ports/readosm/portfile.cmake | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/ports/readosm/CONTROL b/ports/readosm/CONTROL index 104ef3b5c..7a2d817ff 100644 --- a/ports/readosm/CONTROL +++ b/ports/readosm/CONTROL @@ -1,5 +1,7 @@ Source: readosm -Version: 1.1.0-2 +Version: 1.1.0 +Port-Version: 3 Homepage: https://www.gaia-gis.it/gaia-sins/readosm-sources Description: ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf) Build-Depends: expat, zlib +Supports: !(linux|osx|uwp) diff --git a/ports/readosm/portfile.cmake b/ports/readosm/portfile.cmake index 8059a6ffa..522e6fdf5 100644 --- a/ports/readosm/portfile.cmake +++ b/ports/readosm/portfile.cmake @@ -1,4 +1,4 @@ -include(vcpkg_common_functions) +vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP") vcpkg_download_distfile(ARCHIVE URLS "http://www.gaia-gis.it/gaia-sins/readosm-sources/readosm-1.1.0.tar.gz" @@ -16,13 +16,14 @@ vcpkg_extract_source_archive_ex( find_program(NMAKE nmake) -set(LIBS_ALL_DBG "\"${CURRENT_INSTALLED_DIR}/debug/lib/expat.lib\" \"${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib\"") -set(LIBS_ALL_REL "\"${CURRENT_INSTALLED_DIR}/lib/expat.lib\" \"${CURRENT_INSTALLED_DIR}/lib/zlib.lib\"") - if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(LIBS_ALL_DBG "\"${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib\" \"${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib\"") + set(LIBS_ALL_REL "\"${CURRENT_INSTALLED_DIR}/lib/libexpat.lib\" \"${CURRENT_INSTALLED_DIR}/lib/zlib.lib\"") set(CL_FLAGS_DBG "/MDd /Zi") set(CL_FLAGS_REL "/MD /Ox") else() + set(LIBS_ALL_DBG "\"${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib\" \"${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib\"") + set(LIBS_ALL_REL "\"${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib\" \"${CURRENT_INSTALLED_DIR}/lib/zlib.lib\"") set(CL_FLAGS_DBG "/MTd /Zi") set(CL_FLAGS_REL "/MT /Ox") endif() @@ -64,7 +65,6 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/readosm RENAME copyright) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) @@ -82,5 +82,7 @@ else() endif() endif() - message(STATUS "Packaging ${TARGET_TRIPLET} done") + +#Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |