From 5ef9db600c7f19e182453c47ceb2fe27cda5a2dd Mon Sep 17 00:00:00 2001
From: Mark Meredith <mwm126@gmail.com>
Date: Thu, 4 Jun 2020 17:42:21 +0000
Subject: [PATCH] Automatically set pkg_config_path for Conan

---
 .gitlab-ci.yml         | 2 +-
 conanfile.txt          | 4 ++--
 meson.build            | 7 +++++--
 src/csg/CMakeLists.txt | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2fa0fe5..99553c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
 test:meson:
   script:
     - python -m pip install meson ninja conan
-    - env PKG_CONFIG_PATH=$PWD/build meson build
+    - meson build
     - meson test -C build --print-errorlogs
   tags:
     - mfix-exa
diff --git a/conanfile.txt b/conanfile.txt
index 4b842af..bc0cd17 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -1,7 +1,7 @@
 [requires]
-catch2/2.12.1
+catch2/2.12.2
 cgal/5.0.2
-pegtl/2.8.1@taocpp/stable
+taocpp-pegtl/2.8.3
 
 [generators]
 pkg_config
diff --git a/meson.build b/meson.build
index 55dede9..e3fec93 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,14 @@
 project('mfix-parser', 'cpp',
         version : '0.1',
-        default_options : ['warning_level=3', 'cpp_std=c++2a'])
+        default_options : [
+            'warning_level=3',
+            'pkg_config_path=' + meson.build_root(),
+            'cpp_std=c++2a'])
 
 run_command('conan', 'install', '--install-folder', meson.build_root(),
             meson.current_source_dir(), check: true)
 
-pegtl = dependency('pegtl', method: 'pkg-config')
+pegtl = dependency('taocpp-pegtl', method: 'pkg-config')
 catch2 = dependency('catch2', method: 'pkg-config')
 cgal = dependency('cgal', method: 'pkg-config')
 
diff --git a/src/csg/CMakeLists.txt b/src/csg/CMakeLists.txt
index ed0bd36..7a0dd93 100644
--- a/src/csg/CMakeLists.txt
+++ b/src/csg/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(csg
 target_link_libraries(csg PRIVATE
                       stdc++fs
                       CONAN_PKG::cgal
-                      CONAN_PKG::pegtl
+                      CONAN_PKG::taocpp-pegtl
                       )
 
 add_subdirectory(tests)
-- 
GitLab