Use system pkg-config on linux (#6)

* Use system pkg-config for linux * Update versions
JackBoosY · Mar 28, 2022 · a890adf · a890adf
1 parent 1ecb5e5
commit a890adf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake
@@ -22,6 +22,15 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUA
     )
 endif()
 
+# wxWidgets on Linux currently needs to find the system's `gtk+-3.0.pc`.
+# vcpkg's port pkgconf would prevent this lookup.
+if(VCPKG_TARGET_IS_LINUX AND NOT VCPKG_CROSSCOMPILING AND NOT DEFINED ENV{PKG_CONFIG})
+    find_program(system_pkg_config NAMES pkg-config)
+    if(system_pkg_config)
+        set(ENV{PKG_CONFIG} "${system_pkg_config}")
+    endif()
+endif()
+
 # This may be set to ON by users in a custom triplet.
 # The use of 'wxUSE_STL' and 'WXWIDGETS_USE_STD_CONTAINERS' (ON or OFF) are not API compatible
 # which is why they must be set in a custom triplet rather than a port feature.

diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "831a2b85db0f62c98a6148d0b607236b2f2f419a",
+      "git-tree": "116f75bb873cacd211f67d7c4b6399a31040aba5",
       "version-semver": "3.1.5",
       "port-version": 8
     },