Commit 5ef9db60 authored by Mark Meredith's avatar Mark Meredith
Browse files

Automatically set pkg_config_path for Conan

parent 48ae76cd

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -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

conanfile.txt

+2 −2
Original line number Diff line number Diff line 
[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

meson.build

+5 −2
Original line number Diff line number Diff line 
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')

src/csg/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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)