-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[glib] Add unofficial exports to propagate static dependencies
- Loading branch information
1 parent
b4422a1
commit 984d95f
Showing
7 changed files
with
68 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Source: glib | ||
Version: 2.52.3-9 | ||
Version: 2.52.3-11 | ||
Description: Portable, general-purpose utility library. | ||
Build-Depends: zlib, pcre, libffi, gettext, libiconv |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") | ||
include(CMakeFindDependencyMacro) | ||
find_dependency(Threads) | ||
find_dependency(unofficial-iconv) | ||
endif() | ||
|
||
include("${CMAKE_CURRENT_LIST_DIR}/unofficial-glib-targets.cmake") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 3c52731..8305f27 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -314,22 +314,12 @@ endif () | ||
if (HB_HAVE_GLIB) | ||
add_definitions(-DHAVE_GLIB) | ||
|
||
- # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindGLIB.cmake | ||
- find_package(PkgConfig) | ||
- pkg_check_modules(PC_GLIB QUIET glib-2.0) | ||
- | ||
- find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) | ||
- find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include) | ||
- find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0) | ||
- | ||
- include_directories(${GLIBCONFIG_INCLUDE_DIR} ${GLIB_INCLUDE_DIR}) | ||
+ find_package(unofficial-glib CONFIG REQUIRED) | ||
|
||
list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc) | ||
list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-glib.h) | ||
|
||
- list(APPEND THIRD_PARTY_LIBS ${GLIB_LIBRARIES}) | ||
- | ||
- mark_as_advanced(GLIB_LIBRARIES GLIBCONFIG_INCLUDE_DIR GLIB_INCLUDE_DIR) | ||
+ list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib) | ||
endif () | ||
|
||
if (HB_HAVE_ICU) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters