diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2fa0fe590a7cc6477260092b9c01a2ae28a19925..99553c8f1f44dea06aba04bce0ce2865625e28d9 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 4b842afacb027c53932930982bdf480911c01ea7..bc0cd172c1c8b7df82c16c0521d75bf8b9fda232 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 55dede95a1ff8c3628e6793e522eb261cc8c696b..e3fec93c49f801a398fda6d68d72b3aafcfc8a6c 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 ed0bd36038694bf9f1edd1f82b1560abef65dae3..7a0dd93cf023c8a69eaf050c926bf6c5c81a884c 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)