From 4f31703b738ffedd4e8efc6dffe9208126916722 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 23 Apr 2021 10:57:44 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20CMake=20Vita:=20Set=20pkgconfig?=
 =?UTF-8?q?=20path=20and=20fix=20prefix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Make CMake use VitaSDK's pkg-config wrapper.
   Fix sent upstream: https://github.com/vitasdk/vita-toolchain/pull/182

2. Work around broken `prefix` in `pkgconfig` files:
   https://github.com/vitasdk/vdpm/issues/69
---
 .circleci/config.yml | 4 +++-
 CMakeLists.txt       | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f5ee042b4..1d4c9a77f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -135,7 +135,9 @@ jobs:
     working_directory: ~/repo
     steps:
       - checkout
-      - run: apk --no-cache add git cmake ninja
+      # Work around https://github.com/vitasdk/vdpm/issues/69
+      - run: mkdir -p /usr/local && ln -sf /home/user/vitasdk /usr/local/vitasdk
+      - run: apk --no-cache add git cmake ninja bash pkgconfig
       - run: cmake -S. -Bbuild -GNinja -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake -DNIGHTLY_BUILD=ON
       - run: cmake --build build -j 2
       - store_artifacts: {path: ./build/devilutionx.vpk, destination: devilutionx.vpk}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b6e8c02c..2ab8745fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,6 +94,10 @@ if(SWITCH)
 endif()
 
 if(VITA)
+  # Work around a missing setting in the toolchain file.
+  # Fix sent upstream: https://github.com/vitasdk/vita-toolchain/pull/182
+  set(PKG_CONFIG_EXECUTABLE "$ENV{VITASDK}/bin/arm-vita-eabi-pkg-config")
+
   include("$ENV{VITASDK}/share/vita.cmake" REQUIRED)
   include(vita_defs)
 endif()