diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2019-12-24 08:10:42 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-12-23 16:10:42 -0800 |
| commit | 2f89f8dc1628ce83ca57dcfad652fba581baf9d3 (patch) | |
| tree | 14c94d246089d4b605b173b594f7a36c30c67d6c | |
| parent | e7f28a27173686305cfc6db6c1ac3f3a830e231c (diff) | |
| download | vcpkg-2f89f8dc1628ce83ca57dcfad652fba581baf9d3.tar.gz vcpkg-2f89f8dc1628ce83ca57dcfad652fba581baf9d3.zip | |
[io2d] Fix link to target "Cairo::Cairo" error (#8935)
* [io2d] Fix link to target "Cairo::Cairo" error
* [io2d] Remove include(vcpkg_common_functions) in portfile.cmake
| -rw-r--r-- | ports/io2d/CONTROL | 2 | ||||
| -rw-r--r-- | ports/io2d/Fix-FindCairo.patch | 15 | ||||
| -rw-r--r-- | ports/io2d/portfile.cmake | 3 |
3 files changed, 17 insertions, 3 deletions
diff --git a/ports/io2d/CONTROL b/ports/io2d/CONTROL index c48e73334..4e69350d4 100644 --- a/ports/io2d/CONTROL +++ b/ports/io2d/CONTROL @@ -1,4 +1,4 @@ Source: io2d -Version: 2019-07-11-1 +Version: 2019-07-11-2 Description: a lightweight, cross platform drawing library Build-Depends: cairo (!osx), cairo[x11] (linux), graphicsmagick (!osx) diff --git a/ports/io2d/Fix-FindCairo.patch b/ports/io2d/Fix-FindCairo.patch new file mode 100644 index 000000000..e3caa2f7f --- /dev/null +++ b/ports/io2d/Fix-FindCairo.patch @@ -0,0 +1,15 @@ +diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt +index d0e9176..2ac638c 100644 +--- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt ++++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt +@@ -24,7 +24,9 @@ target_include_directories(io2d_cairo PUBLIC + + target_compile_features(io2d_cairo PUBLIC cxx_std_17) + +-target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick) ++find_package(unofficial-cairo CONFIG REQUIRED) ++ ++target_link_libraries(io2d_cairo PUBLIC io2d_core unofficial::cairo::cairo unofficial::graphicsmagick::graphicsmagick) + + install( + TARGETS io2d_cairo EXPORT io2d_targets diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake index da0b23c88..cb07ea3d8 100644 --- a/ports/io2d/portfile.cmake +++ b/ports/io2d/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -10,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-linux-build.patch + Fix-FindCairo.patch ) if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) |