Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
csg-eb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
exa
csg-eb
Commits
5ef9db60
Commit
5ef9db60
authored
4 years ago
by
Mark Meredith
Browse files
Options
Downloads
Patches
Plain Diff
Automatically set pkg_config_path for Conan
parent
48ae76cd
No related branches found
Branches containing commit
No related tags found
1 merge request
!35
Automatically set pkg_config_path for Conan
Pipeline
#21978
passed
4 years ago
Stage: test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
conanfile.txt
+2
-2
2 additions, 2 deletions
conanfile.txt
meson.build
+5
-2
5 additions, 2 deletions
meson.build
src/csg/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/csg/CMakeLists.txt
with
9 additions
and
6 deletions
.gitlab-ci.yml
+
1
−
1
View file @
5ef9db60
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
conanfile.txt
+
2
−
2
View file @
5ef9db60
[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
This diff is collapsed.
Click to expand it.
meson.build
+
5
−
2
View file @
5ef9db60
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'
)
...
...
This diff is collapsed.
Click to expand it.
src/csg/CMakeLists.txt
+
1
−
1
View file @
5ef9db60
...
...
@@ -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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment