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/io2d | |
| 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/io2d')
| -rw-r--r-- | ports/io2d/CONTROL | 3 | ||||
| -rw-r--r-- | ports/io2d/fix-expat.patch | 13 | ||||
| -rw-r--r-- | ports/io2d/portfile.cmake | 9 |
3 files changed, 19 insertions, 6 deletions
diff --git a/ports/io2d/CONTROL b/ports/io2d/CONTROL index 4e69350d4..596cdcd23 100644 --- a/ports/io2d/CONTROL +++ b/ports/io2d/CONTROL @@ -1,4 +1,5 @@ Source: io2d -Version: 2019-07-11-2 +Version: 2019-07-11 +Port-Version: 3 Description: a lightweight, cross platform drawing library Build-Depends: cairo (!osx), cairo[x11] (linux), graphicsmagick (!osx) diff --git a/ports/io2d/fix-expat.patch b/ports/io2d/fix-expat.patch new file mode 100644 index 000000000..25d38bb10 --- /dev/null +++ b/ports/io2d/fix-expat.patch @@ -0,0 +1,13 @@ +diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
+index abb1501..412f3d4 100644
+--- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
++++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
+@@ -32,7 +32,7 @@ if(MSVC)
+ find_library(BZ_LIB bz2)
+ find_library(JPEG_LIB jpeg)
+ find_library(TIFF_LIB tiff)
+- find_library(EXPAT_LIB expat)
++ find_library(EXPAT_LIB libexpat)
+ find_library(LZMA_LIB lzma)
+ find_library(ICONV_LIB libiconv)
+ find_library(CHARSET_LIB libcharset)
diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake index cb07ea3d8..f6f9011e5 100644 --- a/ports/io2d/portfile.cmake +++ b/ports/io2d/portfile.cmake @@ -9,9 +9,10 @@ vcpkg_from_github( PATCHES fix-linux-build.patch Fix-FindCairo.patch + fix-expat.patch ) -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) +if (VCPKG_TARGET_IS_OSX) set(IO2D_DEFAULT_OPTION "-DIO2D_DEFAULT=COREGRAPHICS_MAC") endif() @@ -31,7 +32,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/io2d) -if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) +if (NOT VCPKG_TARGET_IS_OSX) file(RENAME ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake ${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake) file(WRITE ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake " include(CMakeFindDependencyMacro) @@ -42,6 +43,4 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) ") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_test_cmake(PACKAGE_NAME io2d) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |