mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 01:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[io2d] Fix link to target "Cairo::Cairo" error (#8935)

Browse Source 
* [io2d] Fix link to target "Cairo::Cairo" error

* [io2d] Remove include(vcpkg_common_functions) in portfile.cmake
This commit is contained in:
Lily 2019-12-24 08:10:42 +08:00 committed by dan-shaw
parent e7f28a2717
commit 2f89f8dc16
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/io2d/CONTROL
View File

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

15
ports/io2d/Fix-FindCairo.patch Normal file
View File

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

3
ports/io2d/portfile.cmake
View File

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