diff options
| author | Andrei Lebedev <lebdron@gmail.com> | 2019-06-12 08:25:07 +0300 |
|---|---|---|
| committer | Andrei Lebedev <lebdron@gmail.com> | 2019-06-12 08:25:07 +0300 |
| commit | 34d19da9ffd0571bf16190ec4a16a04bef265900 (patch) | |
| tree | 413690269c5f216194b9a0f72f0438b27ccfd68d /ports/glib | |
| parent | b395438c791ca9f78e383a1d571525eee785e67c (diff) | |
| parent | 59a8a9c6248ed230b19028a44484ae5f06db697d (diff) | |
| download | vcpkg-34d19da9ffd0571bf16190ec4a16a04bef265900.tar.gz vcpkg-34d19da9ffd0571bf16190ec4a16a04bef265900.zip | |
Merge branch 'master' into openssl-unix-dynamic
Diffstat (limited to 'ports/glib')
| -rw-r--r-- | ports/glib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/glib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glib/cmake/unofficial-glib-config.in.cmake | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index 49e4e1112..ccc2a77e2 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -330,8 +330,8 @@ install( DESTINATION share/unofficial-glib ) configure_file( - cmake/unofficial-glib-config.in.cmake - cmake/unofficial-glib-config.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/unofficial-glib-config.in.cmake + ${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-glib-config.cmake @ONLY ) install( diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index 9197a6037..f2a619c9c 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,4 +1,4 @@ Source: glib -Version: 2.52.3-14-1 +Version: 2.52.3-14-2 Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/ports/glib/cmake/unofficial-glib-config.in.cmake b/ports/glib/cmake/unofficial-glib-config.in.cmake index 976e52a9b..ea87ea0b2 100644 --- a/ports/glib/cmake/unofficial-glib-config.in.cmake +++ b/ports/glib/cmake/unofficial-glib-config.in.cmake @@ -1,7 +1,7 @@ -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
- include(CMakeFindDependencyMacro)
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-iconv)
+if(NOT WIN32)
find_dependency(Threads)
- find_dependency(unofficial-iconv)
endif()
include("${CMAKE_CURRENT_LIST_DIR}/unofficial-glib-targets.cmake")
|