mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-03 08:29:01 +08:00
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
|
diff --git a/cmake/FindCAIRO.cmake b/cmake/FindCAIRO.cmake
|
||
|
|
index a92916e..799fa68 100644
|
||
|
|
--- a/cmake/FindCAIRO.cmake
|
||
|
|
+++ b/cmake/FindCAIRO.cmake
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
include(FindPackageHandleStandardArgs)
|
||
|
|
|
||
|
|
-if(WIN32)
|
||
|
|
+if(0)
|
||
|
|
find_path(CAIRO_INCLUDE_DIR cairo/cairo.h)
|
||
|
|
|
||
|
|
find_library(CAIRO_LIBRARY NAMES cairo)
|
||
|
|
diff --git a/cmake/FindGD.cmake b/cmake/FindGD.cmake
|
||
|
|
index d7e0cc9..2322fcd 100644
|
||
|
|
--- a/cmake/FindGD.cmake
|
||
|
|
+++ b/cmake/FindGD.cmake
|
||
|
|
@@ -1,3 +1,11 @@
|
||
|
|
+find_package(PkgConfig)
|
||
|
|
+pkg_check_modules(GD gdlib IMPORTED_TARGET)
|
||
|
|
+set(GD_LIBRARIES PkgConfig::GD)
|
||
|
|
+foreach(item IN ITEMS FONTCONFIG FREETYPE GIF JPEG PNG)
|
||
|
|
+ set(HAVE_GD_${item} 1)
|
||
|
|
+endforeach()
|
||
|
|
+return()
|
||
|
|
+
|
||
|
|
find_path(GD_INCLUDE_DIR gd.h)
|
||
|
|
find_library(GD_LIBRARY NAMES gd libgd)
|
||
|
|
find_program(GD_RUNTIME_LIBRARY libgd.dll)
|
||
|
|
diff --git a/cmake/FindLTDL.cmake b/cmake/FindLTDL.cmake
|
||
|
|
index a1ee8c2..08b7f50 100644
|
||
|
|
--- a/cmake/FindLTDL.cmake
|
||
|
|
+++ b/cmake/FindLTDL.cmake
|
||
|
|
@@ -16,3 +16,6 @@ mark_as_advanced(LTDL_INCLUDE_DIR LTDL_LIBRARY)
|
||
|
|
|
||
|
|
set(LTDL_INCLUDE_DIRS ${LTDL_INCLUDE_DIR})
|
||
|
|
set(LTDL_LIBRARIES ${LTDL_LIBRARY})
|
||
|
|
+if(CMAKE_DL_LIBS AND NOT BUILD_SHARED_LIBS)
|
||
|
|
+ set(LTDL_LIBRARIES "${LTDL_LIBRARIES};${CMAKE_DL_LIBS}")
|
||
|
|
+endif()
|
||
|
|
diff --git a/cmake/FindPANGOCAIRO.cmake b/cmake/FindPANGOCAIRO.cmake
|
||
|
|
index b92e5be..225589e 100644
|
||
|
|
--- a/cmake/FindPANGOCAIRO.cmake
|
||
|
|
+++ b/cmake/FindPANGOCAIRO.cmake
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
include(FindPackageHandleStandardArgs)
|
||
|
|
|
||
|
|
-if(WIN32)
|
||
|
|
+if(0)
|
||
|
|
find_path(PANGOCAIRO_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0)
|
||
|
|
find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0)
|
||
|
|
find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h
|
||
|
|
@@ -78,7 +78,8 @@ if(WIN32)
|
||
|
|
)
|
||
|
|
else()
|
||
|
|
find_package(PkgConfig)
|
||
|
|
- pkg_check_modules(PANGOCAIRO pangocairo)
|
||
|
|
+ pkg_check_modules(PANGOCAIRO pangocairo IMPORTED_TARGET)
|
||
|
|
+ set(PANGOCAIRO_LINK_LIBRARIES PkgConfig::PANGOCAIRO) # https://gitlab.kitware.com/cmake/cmake/-/issues/16154
|
||
|
|
|
||
|
|
find_package_handle_standard_args(PANGOCAIRO DEFAULT_MSG
|
||
|
|
PANGOCAIRO_INCLUDE_DIRS
|